diff options
275 files changed, 10348 insertions, 11634 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py index ff6a3587015..fe564e936c6 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -57,7 +57,6 @@ tests = [ ("Ice/gc", ["once", "noc++11"]), ("Ice/dispatcher", ["once"]), ("Ice/checksum", ["core"]), - ("Ice/stream", ["core", "noc++11"]), ("Ice/hold", ["core", "bt"]), ("Ice/custom", ["core", "nossl", "nows", "noc++11"]), ("Ice/retry", ["core"]), diff --git a/cpp/include/Ice/AsyncResult.h b/cpp/include/Ice/AsyncResult.h index 82b6a49481d..35c307f0d27 100644 --- a/cpp/include/Ice/AsyncResult.h +++ b/cpp/include/Ice/AsyncResult.h @@ -21,7 +21,7 @@ #include <Ice/RequestHandlerF.h> #include <Ice/AsyncResultF.h> #include <Ice/ObserverHelper.h> -#include <Ice/BasicStream.h> +#include <Ice/InputStream.h> #include <Ice/VirtualShared.h> namespace IceInternal @@ -77,22 +77,22 @@ public: const std::string& getOperation() const; - ::IceInternal::BasicStream* __startReadParams() + ::Ice::InputStream* __startReadParams() { - _is.startReadEncaps(); + _is.startEncapsulation(); return &_is; } void __endReadParams() { - _is.endReadEncaps(); + _is.endEncapsulation(); } void __readEmptyParams() { - _is.skipEmptyEncaps(); + _is.skipEmptyEncapsulation(); } void __readParamEncaps(const ::Ice::Byte*& encaps, ::Ice::Int& sz) { - _is.readEncaps(encaps, sz); + _is.readEncapsulation(encaps, sz); } void __throwUserException(); @@ -137,7 +137,7 @@ protected: Ice::ConnectionPtr _cachedConnection; bool _sentSynchronously; - IceInternal::BasicStream _is; + Ice::InputStream _is; IceUtil::Monitor<IceUtil::Mutex> _monitor; diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h deleted file mode 100644 index 3e84af32f81..00000000000 --- a/cpp/include/Ice/BasicStream.h +++ /dev/null @@ -1,1376 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef ICE_BASIC_STREAM_H -#define ICE_BASIC_STREAM_H - -#include <IceUtil/StringConverter.h> -#include <Ice/InstanceF.h> -#include <Ice/Object.h> -#include <Ice/ValueF.h> -#include <Ice/ProxyF.h> -#include <Ice/ValueFactory.h> -#include <Ice/ValueFactoryManagerF.h> -#include <Ice/Buffer.h> -#include <Ice/Protocol.h> -#include <Ice/SlicedDataF.h> -#include <Ice/UserExceptionFactory.h> -#include <Ice/StreamHelpers.h> -#include <Ice/FactoryTable.h> -#include <Ice/Traits.h> - -namespace Ice -{ - -class UserException; - -} - -namespace IceInternal -{ - -template<typename T> inline void -patchHandle(void* addr, const Ice::ValuePtr& v) -{ -#ifdef ICE_CPP11_MAPPING - ::std::shared_ptr<T>* handle = static_cast<::std::shared_ptr<T>*>(addr); - *handle = ::std::dynamic_pointer_cast<T>(v); - if(v && !(*handle)) - { - IceInternal::Ex::throwUOE(T::ice_staticId(), v); - } -#else - IceInternal::Handle<T>* p = static_cast<IceInternal::Handle<T>*>(addr); - __patch(*p, v); // Generated __patch method, necessary for forward declarations. -#endif -} - -class ICE_API BasicStream : public Buffer -{ -public: - - typedef size_t size_type; - typedef void (*PatchFunc)(void*, const Ice::ValuePtr&); - - BasicStream(Instance*, const Ice::EncodingVersion&); - BasicStream(Instance*, const Ice::EncodingVersion&, const Ice::Byte*, const Ice::Byte*); - ~BasicStream() - { - // Inlined for performance reasons. - - if(_currentReadEncaps != &_preAllocatedReadEncaps || _currentWriteEncaps != &_preAllocatedWriteEncaps) - { - clear(); // Not inlined. - } - } - - void clear(); - - // - // Must return Instance*, because we don't hold an InstancePtr for - // optimization reasons (see comments below). - // - Instance* instance() const { return _instance; } // Inlined for performance reasons. - - void* closure() const; - void* closure(void*); - - void swap(BasicStream&); - void resetEncaps(); - - void resize(Container::size_type sz) - { - b.resize(sz); - i = b.end(); - } - - void startWriteObject(const Ice::SlicedDataPtr& data) - { - assert(_currentWriteEncaps && _currentWriteEncaps->encoder); - _currentWriteEncaps->encoder->startInstance(ObjectSlice, data); - } - void endWriteObject() - { - assert(_currentWriteEncaps && _currentWriteEncaps->encoder); - _currentWriteEncaps->encoder->endInstance(); - } - - void startReadObject() - { - assert(_currentReadEncaps && _currentReadEncaps->decoder); - _currentReadEncaps->decoder->startInstance(ObjectSlice); - } - Ice::SlicedDataPtr endReadObject(bool preserve) - { - assert(_currentReadEncaps && _currentReadEncaps->decoder); - return _currentReadEncaps->decoder->endInstance(preserve); - } - - void startWriteException(const Ice::SlicedDataPtr& data) - { - assert(_currentWriteEncaps && _currentWriteEncaps->encoder); - _currentWriteEncaps->encoder->startInstance(ExceptionSlice, data); - } - void endWriteException() - { - assert(_currentWriteEncaps && _currentWriteEncaps->encoder); - _currentWriteEncaps->encoder->endInstance(); - } - - void startReadException() - { - assert(_currentReadEncaps && _currentReadEncaps->decoder); - _currentReadEncaps->decoder->startInstance(ExceptionSlice); - } - Ice::SlicedDataPtr endReadException(bool preserve) - { - assert(_currentReadEncaps && _currentReadEncaps->decoder); - return _currentReadEncaps->decoder->endInstance(preserve); - } - - void startWriteEncaps(); - - void startWriteEncaps(const Ice::EncodingVersion& encoding, Ice::FormatType format) - { - checkSupportedEncoding(encoding); - - WriteEncaps* oldEncaps = _currentWriteEncaps; - if(!oldEncaps) // First allocated encaps? - { - _currentWriteEncaps = &_preAllocatedWriteEncaps; - } - else - { - _currentWriteEncaps = new WriteEncaps(); - _currentWriteEncaps->previous = oldEncaps; - } - _currentWriteEncaps->format = format; - _currentWriteEncaps->encoding = encoding; - _currentWriteEncaps->start = b.size(); - - write(Ice::Int(0)); // Placeholder for the encapsulation length. - write(_currentWriteEncaps->encoding); - } - void endWriteEncaps() - { - assert(_currentWriteEncaps); - - // Size includes size and version. - const Ice::Int sz = static_cast<Ice::Int>(b.size() - _currentWriteEncaps->start); - write(sz, &(*(b.begin() + _currentWriteEncaps->start))); - - WriteEncaps* oldEncaps = _currentWriteEncaps; - _currentWriteEncaps = _currentWriteEncaps->previous; - if(oldEncaps == &_preAllocatedWriteEncaps) - { - oldEncaps->reset(); - } - else - { - delete oldEncaps; - } - } - void endWriteEncapsChecked(); // Used by public stream API. - void writeEmptyEncaps(const Ice::EncodingVersion& encoding) - { - checkSupportedEncoding(encoding); - write(Ice::Int(6)); // Size - write(encoding); - } - void writeEncaps(const Ice::Byte* v, Ice::Int sz) - { - if(sz < 6) - { - throwEncapsulationException(__FILE__, __LINE__); - } - - Container::size_type position = b.size(); - resize(position + sz); - memcpy(&b[position], &v[0], sz); - } - - const Ice::EncodingVersion& getWriteEncoding() const - { - return _currentWriteEncaps ? _currentWriteEncaps->encoding : _encoding; - } - - const Ice::EncodingVersion& startReadEncaps() - { - ReadEncaps* oldEncaps = _currentReadEncaps; - if(!oldEncaps) // First allocated encaps? - { - _currentReadEncaps = &_preAllocatedReadEncaps; - } - else - { - _currentReadEncaps = new ReadEncaps(); - _currentReadEncaps->previous = oldEncaps; - } - _currentReadEncaps->start = i - b.begin(); - - // - // I don't use readSize() and writeSize() for encapsulations, - // because when creating an encapsulation, I must know in advance - // how many bytes the size information will require in the data - // stream. If I use an Int, it is always 4 bytes. For - // readSize()/writeSize(), it could be 1 or 5 bytes. - // - Ice::Int sz; - read(sz); - if(sz < 6) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - if(i - sizeof(Ice::Int) + sz > b.end()) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - _currentReadEncaps->sz = sz; - - read(_currentReadEncaps->encoding); - checkSupportedEncoding(_currentReadEncaps->encoding); // Make sure the encoding is supported - - return _currentReadEncaps->encoding; - } - - void endReadEncaps() - { - assert(_currentReadEncaps); - - if(_currentReadEncaps->encoding != Ice::Encoding_1_0) - { - skipOpts(); - if(i != b.begin() + _currentReadEncaps->start + _currentReadEncaps->sz) - { - throwEncapsulationException(__FILE__, __LINE__); - } - } - else if(i != b.begin() + _currentReadEncaps->start + _currentReadEncaps->sz) - { - if(i + 1 != b.begin() + _currentReadEncaps->start + _currentReadEncaps->sz) - { - throwEncapsulationException(__FILE__, __LINE__); - } - - // - // Ice version < 3.3 had a bug where user exceptions with - // class members could be encoded with a trailing byte - // when dispatched with AMD. So we tolerate an extra byte - // in the encapsulation. - // - ++i; - } - - ReadEncaps* oldEncaps = _currentReadEncaps; - _currentReadEncaps = _currentReadEncaps->previous; - if(oldEncaps == &_preAllocatedReadEncaps) - { - oldEncaps->reset(); - } - else - { - delete oldEncaps; - } - } - Ice::EncodingVersion skipEmptyEncaps() - { - Ice::Int sz; - read(sz); - if(sz != static_cast<Ice::Int>(sizeof(Ice::Int)) + 2) - { - throwEncapsulationException(__FILE__, __LINE__); - } - - if(i + 2 > b.end()) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - - Ice::EncodingVersion encoding; - read(encoding); - return encoding; - } - void endReadEncapsChecked(); // Used by public stream API. - Ice::EncodingVersion readEncaps(const Ice::Byte*& v, Ice::Int& sz) - { - Ice::EncodingVersion encoding; - v = i; - read(sz); - if(sz < 6) - { - throwEncapsulationException(__FILE__, __LINE__); - } - if(i - sizeof(Ice::Int) + sz > b.end()) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - - read(encoding); - i += sz - sizeof(Ice::Int) - 2; - return encoding; - } - - const Ice::EncodingVersion& getReadEncoding() const - { - return _currentReadEncaps ? _currentReadEncaps->encoding : _encoding; - } - - Ice::Int getReadEncapsSize(); - Ice::EncodingVersion skipEncaps(); - - void startWriteSlice(const std::string& typeId, int compactId, bool last) - { - assert(_currentWriteEncaps && _currentWriteEncaps->encoder); - _currentWriteEncaps->encoder->startSlice(typeId, compactId, last); - } - void endWriteSlice() - { - assert(_currentWriteEncaps && _currentWriteEncaps->encoder); - _currentWriteEncaps->encoder->endSlice(); - } - - std::string startReadSlice() - { - assert(_currentReadEncaps && _currentReadEncaps->decoder); - return _currentReadEncaps->decoder->startSlice(); - } - void endReadSlice() - { - assert(_currentReadEncaps && _currentReadEncaps->decoder); - _currentReadEncaps->decoder->endSlice(); - } - void skipSlice() - { - assert(_currentReadEncaps && _currentReadEncaps->decoder); - _currentReadEncaps->decoder->skipSlice(); - } - - void readPendingObjects(); - void writePendingObjects(); - - void writeSize(Ice::Int v) // Inlined for performance reasons. - { - assert(v >= 0); - if(v > 254) - { - write(Ice::Byte(255)); - write(v); - } - else - { - write(static_cast<Ice::Byte>(v)); - } - } - void rewriteSize(Ice::Int v, Container::iterator dest) - { - assert(v >= 0); - if(v > 254) - { - *dest++ = Ice::Byte(255); - write(v, dest); - } - else - { - *dest = static_cast<Ice::Byte>(v); - } - } - Ice::Int readSize() // Inlined for performance reasons. - { - Ice::Byte byte; - read(byte); - unsigned char val = static_cast<unsigned char>(byte); - if(val == 255) - { - Ice::Int v; - read(v); - if(v < 0) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - return v; - } - else - { - return static_cast<Ice::Int>(static_cast<unsigned char>(byte)); - } - } - - Ice::Int readAndCheckSeqSize(int); - - size_type startSize() - { - size_type position = b.size(); - write(Ice::Int(0)); - return position; - } - - void endSize(size_type position) - { - rewrite(static_cast<Ice::Int>(b.size() - position) - 4, position); - } - - void writeBlob(const std::vector<Ice::Byte>&); - void readBlob(std::vector<Ice::Byte>&, Ice::Int); - - void writeBlob(const Ice::Byte* v, Container::size_type sz) - { - if(sz > 0) - { - Container::size_type position = b.size(); - resize(position + sz); - memcpy(&b[position], &v[0], sz); - } - } - - void readBlob(const Ice::Byte*& v, Container::size_type sz) - { - if(sz > 0) - { - v = i; - if(static_cast<Container::size_type>(b.end() - i) < sz) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - i += sz; - } - else - { - v = i; - } - } - - template<typename T> void write(const T& v) - { - Ice::StreamHelper<T, Ice::StreamableTraits<T>::helper>::write(this, v); - } - template<typename T> void read(T& v) - { - Ice::StreamHelper<T, Ice::StreamableTraits<T>::helper>::read(this, v); - } - - template<typename T> void write(Ice::Int tag, const IceUtil::Optional<T>& v) - { - if(!v) - { - return; // Optional not set - } - - if(writeOpt(tag, Ice::StreamOptionalHelper<T, - Ice::StreamableTraits<T>::helper, - Ice::StreamableTraits<T>::fixedLength>::optionalFormat)) - { - Ice::StreamOptionalHelper<T, - Ice::StreamableTraits<T>::helper, - Ice::StreamableTraits<T>::fixedLength>::write(this, *v); - } - } - template<typename T> void read(Ice::Int tag, IceUtil::Optional<T>& v) - { - if(readOpt(tag, Ice::StreamOptionalHelper<T, - Ice::StreamableTraits<T>::helper, - Ice::StreamableTraits<T>::fixedLength>::optionalFormat)) - { - v.__setIsSet(); - Ice::StreamOptionalHelper<T, - Ice::StreamableTraits<T>::helper, - Ice::StreamableTraits<T>::fixedLength>::read(this, *v); - } - else - { - v = IceUtil::None; - } - } - - // - // Template functions for sequences and custom sequences - // - template<typename T> void write(const std::vector<T>& v) - { - if(v.empty()) - { - writeSize(0); - } - else - { - write(&v[0], &v[0] + v.size()); - } - } - template<typename T> void write(const T* begin, const T* end) - { - writeSize(static_cast<Ice::Int>(end - begin)); - for(const T* p = begin; p != end; ++p) - { - write(*p); - } - } - - // Read/write type and tag for optionals - bool writeOpt(Ice::Int tag, Ice::OptionalFormat format) - { - assert(_currentWriteEncaps); - if(_currentWriteEncaps->encoder) - { - return _currentWriteEncaps->encoder->writeOpt(tag, format); - } - else - { - return writeOptImpl(tag, format); - } - } - bool readOpt(Ice::Int tag, Ice::OptionalFormat expectedFormat) - { - assert(_currentReadEncaps); - if(_currentReadEncaps->decoder) - { - return _currentReadEncaps->decoder->readOpt(tag, expectedFormat); - } - else - { - return readOptImpl(tag, expectedFormat); - } - } - - // Byte - void write(Ice::Byte v) - { - b.push_back(v); - } - void write(const Ice::Byte*, const Ice::Byte*); - void read(Ice::Byte& v) - { - if(i >= b.end()) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - v = *i++; - } - void read(std::vector<Ice::Byte>&); - void read(std::pair<const Ice::Byte*, const Ice::Byte*>&); - - // This method is useful for generic stream helpers - void read(std::pair<const Ice::Byte*, const Ice::Byte*>& p, ::IceUtil::ScopedArray<Ice::Byte>& result) - { - result.reset(); - read(p); - } - - // Bool - void write(bool v) - { - b.push_back(static_cast<Ice::Byte>(v)); - } - void write(const std::vector<bool>&); - void write(const bool*, const bool*); - void read(bool& v) - { - if(i >= b.end()) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - v = (0 != *i++); - } - void read(std::vector<bool>&); - void read(std::pair<const bool*, const bool*>&, ::IceUtil::ScopedArray<bool>&); - - // Short - void write(Ice::Short); - void write(const Ice::Short*, const Ice::Short*); - void read(Ice::Short&); - void read(std::vector<Ice::Short>&); - void read(std::pair<const Ice::Short*, const Ice::Short*>&, ::IceUtil::ScopedArray<Ice::Short>&); - - // Int - void write(Ice::Int v) // Inlined for performance reasons. - { - Container::size_type position = b.size(); - resize(position + sizeof(Ice::Int)); - write(v, &b[position]); - } - void write(Ice::Int v, Container::iterator dest) - { -#ifdef ICE_BIG_ENDIAN - const Ice::Byte* src = reinterpret_cast<const Ice::Byte*>(&v) + sizeof(Ice::Int) - 1; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest = *src; -#else - const Ice::Byte* src = reinterpret_cast<const Ice::Byte*>(&v); - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest = *src; -#endif - } - - void read(Ice::Int& v) // Inlined for performance reasons. - { - if(b.end() - i < static_cast<int>(sizeof(Ice::Int))) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - const Ice::Byte* src = &(*i); - i += sizeof(Ice::Int); -#ifdef ICE_BIG_ENDIAN - Ice::Byte* dest = reinterpret_cast<Ice::Byte*>(&v) + sizeof(Ice::Int) - 1; - *dest-- = *src++; - *dest-- = *src++; - *dest-- = *src++; - *dest = *src; -#else - Ice::Byte* dest = reinterpret_cast<Ice::Byte*>(&v); - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest = *src; -#endif - } - - 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::ScopedArray<Ice::Int>&); - - // Long - -#ifdef ICE_CPP11_MAPPING - void write(long long int); -#else - void write(Ice::Long); -#endif - - void write(const Ice::Long*, const Ice::Long*); - void read(Ice::Long&); - void read(std::vector<Ice::Long>&); - void read(std::pair<const Ice::Long*, const Ice::Long*>&, ::IceUtil::ScopedArray<Ice::Long>&); - - // Float - void write(Ice::Float); - void write(const Ice::Float*, const Ice::Float*); - void read(Ice::Float&); - void read(std::vector<Ice::Float>&); - void read(std::pair<const Ice::Float*, const Ice::Float*>&, ::IceUtil::ScopedArray<Ice::Float>&); - - // Double - void write(Ice::Double); - void write(const Ice::Double*, const Ice::Double*); - void read(Ice::Double&); - void read(std::vector<Ice::Double>&); - void read(std::pair<const Ice::Double*, const Ice::Double*>&, ::IceUtil::ScopedArray<Ice::Double>&); - - // String - void write(const std::string& v, bool convert = true) - { - Ice::Int sz = static_cast<Ice::Int>(v.size()); - if(convert && sz > 0 && _stringConverter != 0) - { - writeConverted(v.data(), static_cast<size_t>(sz)); - } - else - { - writeSize(sz); - if(sz > 0) - { - Container::size_type position = b.size(); - resize(position + sz); - memcpy(&b[position], v.data(), sz); - } - } - } - - // for custom strings - void write(const char* vdata, size_t vsize, bool convert = true) - { - Ice::Int sz = static_cast<Ice::Int>(vsize); - if(convert && sz > 0 && _stringConverter != 0) - { - writeConverted(vdata, vsize); - } - else - { - writeSize(sz); - if(sz > 0) - { - Container::size_type position = b.size(); - resize(position + sz); - memcpy(&b[position], vdata, vsize); - } - } - } - - // Null-terminated C string - void write(const char* vdata, bool convert = true) - { - write(vdata, strlen(vdata), convert); - } - - void write(const std::string*, const std::string*, bool = true); - - void read(std::string& v, bool convert = true) - { - Ice::Int sz = readSize(); - if(sz > 0) - { - if(b.end() - i < sz) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - if(convert && _stringConverter != 0) - { - readConverted(v, sz); - } - else - { - std::string(reinterpret_cast<const char*>(&*i), reinterpret_cast<const char*>(&*i) + sz).swap(v); - } - i += sz; - } - else - { - v.clear(); - } - } - - // For custom strings, convert = false - void read(const char*& vdata, size_t& vsize) - { - Ice::Int sz = readSize(); - if(sz > 0) - { - if(b.end() - i < sz) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - - vdata = reinterpret_cast<const char*>(&*i); - vsize = static_cast<size_t>(sz); - i += sz; - } - else - { - vdata = 0; - vsize = 0; - } - } - - // For custom strings, convert = true - void read(const char*& vdata, size_t& vsize, std::string& holder) - { - if(_stringConverter == 0) - { - holder.clear(); - read(vdata, vsize); - } - else - { - Ice::Int sz = readSize(); - if(sz > 0) - { - if(b.end() - i < sz) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - - readConverted(holder, sz); - vdata = holder.data(); - vsize = holder.size(); - } - else - { - holder.clear(); - vdata = 0; - vsize = 0; - } - } - } - - void read(std::vector<std::string>&, bool = true); - - void write(const std::wstring& v); - void write(const std::wstring*, const std::wstring*); - void read(std::wstring&); - void read(std::vector<std::wstring>&); - - // Proxy -#ifdef ICE_CPP11_MAPPING - void writeProxy(const Ice::ObjectPrxPtr&); - - template<typename T, typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type* = nullptr> - void write(const ::std::shared_ptr<T>& v) - { - writeProxy(::std::static_pointer_cast<::Ice::ObjectPrx>(v)); - } - - ::std::shared_ptr<::Ice::ObjectPrx> readProxy(); - - template<typename T, typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type* = nullptr> - void read(::std::shared_ptr<T>& v) - { - ::std::shared_ptr<::Ice::ObjectPrx> proxy(readProxy()); - if(!proxy) - { - v = 0; - } - else - { - v = ::IceInternal::createProxy<T>(); - v->__copyFrom(proxy); - } - } -#else - void write(const Ice::ObjectPrx&); - template<typename T> void write(const IceInternal::ProxyHandle<T>& v) - { - write(Ice::ObjectPrx(upCast(v.get()))); - } - void read(Ice::ObjectPrx&); - template<typename T> void read(IceInternal::ProxyHandle<T>& v) - { - __read(this, v); // Generated __read method, necessary for forward declarations. - } -#endif - - // Class -#ifdef ICE_CPP11_MAPPING // C++11 mapping - template<typename T, typename ::std::enable_if<::std::is_base_of<::Ice::Value, T>::value>::type* = nullptr> - void write(const ::std::shared_ptr<T>& v) - { - initWriteEncaps(); - _currentWriteEncaps->encoder->write(v); - } - - template<typename T, typename ::std::enable_if<::std::is_base_of<::Ice::Value, T>::value>::type* = nullptr> - void read(::std::shared_ptr<T>& v) - { - read(&patchHandle<T>, &v); - } -#else // C++98 mapping - void write(const Ice::ObjectPtr& v) - { - initWriteEncaps(); - _currentWriteEncaps->encoder->write(v); - } - template<typename T> void write(const IceInternal::Handle<T>& v) - { - write(Ice::ObjectPtr(upCast(v.get()))); - } - - template<typename T> void read(IceInternal::Handle<T>& v) - { - read(&patchHandle<T>, &v); - } -#endif - - void read(PatchFunc patchFunc, void* patchAddr) - { - initReadEncaps(); - _currentReadEncaps->decoder->read(patchFunc, patchAddr); - } - - // Enum - Ice::Int readEnum(Ice::Int); - void writeEnum(Ice::Int, Ice::Int); - - // Exception - void writeException(const Ice::UserException&); - void throwException(const UserExceptionFactoryPtr& = 0); - - void sliceObjects(bool); - - // Read/write/skip optionals - bool readOptImpl(Ice::Int, Ice::OptionalFormat); - bool writeOptImpl(Ice::Int, Ice::OptionalFormat); - void skipOpt(Ice::OptionalFormat); - void skipOpts(); - - // Skip bytes from the stream - void skip(size_type size) - { - if(i + size > b.end()) - { - throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); - } - i += size; - } - void skipSize() - { - Ice::Byte bt; - read(bt); - if(static_cast<unsigned char>(bt) == 255) - { - skip(4); - } - } - - size_type pos() - { - return i - b.begin(); - } - - void rewrite(Ice::Int value, size_type p) - { - write(value, b.begin() + p); - } - -private: - - // - // String - // - void writeConverted(const char*, size_t); - void readConverted(std::string&, Ice::Int); - - // - // I can't throw these exception from inline functions from within - // this file, because I cannot include the header with the - // exceptions. Doing so would screw up the whole include file - // ordering. - // - void throwUnmarshalOutOfBoundsException(const char*, int); - void throwEncapsulationException(const char*, int); - - // - // Optimization. The instance may not be deleted while a - // stack-allocated BasicStream still holds it. - // - Instance* _instance; - - // - // The public stream API needs to attach data to a stream. - // - void* _closure; - - class ReadEncaps; - class WriteEncaps; - enum SliceType { NoSlice, ObjectSlice, ExceptionSlice }; - - typedef std::vector<Ice::ValuePtr> ObjectList; - - class ICE_API EncapsDecoder : private ::IceUtil::noncopyable - { - public: - - virtual ~EncapsDecoder() { } - - virtual void read(PatchFunc, void*) = 0; - virtual void throwException(const UserExceptionFactoryPtr&) = 0; - - virtual void startInstance(SliceType) = 0; - virtual Ice::SlicedDataPtr endInstance(bool) = 0; - virtual const std::string& startSlice() = 0; - virtual void endSlice() = 0; - virtual void skipSlice() = 0; - - virtual bool readOpt(Ice::Int, Ice::OptionalFormat) - { - return false; - } - - virtual void readPendingObjects() - { - } - - protected: - - EncapsDecoder(BasicStream* stream, ReadEncaps* encaps, bool sliceObjects, const ValueFactoryManagerPtr& f) : - _stream(stream), _encaps(encaps), _sliceObjects(sliceObjects), _servantFactoryManager(f), _typeIdIndex(0) - { - } - - std::string readTypeId(bool); - Ice::ValuePtr newInstance(const std::string&); - - void addPatchEntry(Ice::Int, PatchFunc, void*); - void unmarshal(Ice::Int, const Ice::ValuePtr&); - - typedef std::map<Ice::Int, Ice::ValuePtr> IndexToPtrMap; - typedef std::map<Ice::Int, std::string> TypeIdReadMap; - - struct PatchEntry - { - PatchFunc patchFunc; - void* patchAddr; - }; - typedef std::vector<PatchEntry> PatchList; - typedef std::map<Ice::Int, PatchList> PatchMap; - - BasicStream* _stream; - ReadEncaps* _encaps; - const bool _sliceObjects; - ValueFactoryManagerPtr _servantFactoryManager; - - // Encapsulation attributes for object un-marshalling - PatchMap _patchMap; - - private: - - // Encapsulation attributes for object un-marshalling - IndexToPtrMap _unmarshaledMap; - TypeIdReadMap _typeIdMap; - Ice::Int _typeIdIndex; - ObjectList _objectList; - }; - - class ICE_API EncapsDecoder10 : public EncapsDecoder - { - public: - - EncapsDecoder10(BasicStream* stream, ReadEncaps* encaps, bool sliceObjects, const ValueFactoryManagerPtr& f) : - EncapsDecoder(stream, encaps, sliceObjects, f), _sliceType(NoSlice) - { - } - - virtual void read(PatchFunc, void*); - virtual void throwException(const UserExceptionFactoryPtr&); - - virtual void startInstance(SliceType); - virtual Ice::SlicedDataPtr endInstance(bool); - virtual const std::string& startSlice(); - virtual void endSlice(); - virtual void skipSlice(); - - virtual void readPendingObjects(); - - private: - - void readInstance(); - - // Instance attributes - SliceType _sliceType; - bool _skipFirstSlice; - - // Slice attributes - Ice::Int _sliceSize; - std::string _typeId; - }; - - class ICE_API EncapsDecoder11 : public EncapsDecoder - { - public: - - EncapsDecoder11(BasicStream* stream, ReadEncaps* encaps, bool sliceObjects, const ValueFactoryManagerPtr& f) : - EncapsDecoder(stream, encaps, sliceObjects, f), _preAllocatedInstanceData(0), _current(0), _objectIdIndex(1) - { - } - - virtual void read(PatchFunc, void*); - virtual void throwException(const UserExceptionFactoryPtr&); - - virtual void startInstance(SliceType); - virtual Ice::SlicedDataPtr endInstance(bool); - virtual const std::string& startSlice(); - virtual void endSlice(); - virtual void skipSlice(); - - virtual bool readOpt(Ice::Int, Ice::OptionalFormat); - - private: - - Ice::Int readInstance(Ice::Int, PatchFunc, void*); - Ice::SlicedDataPtr readSlicedData(); - - struct IndirectPatchEntry - { - Ice::Int index; - PatchFunc patchFunc; - void* patchAddr; - }; - typedef std::vector<IndirectPatchEntry> IndirectPatchList; - - typedef std::vector<Ice::Int> IndexList; - typedef std::vector<IndexList> IndexListList; - - struct InstanceData - { - InstanceData(InstanceData* p) : previous(p), next(0) - { - if(previous) - { - previous->next = this; - } - } - - ~InstanceData() - { - if(next) - { - delete next; - } - } - - // Instance attributes - SliceType sliceType; - bool skipFirstSlice; - Ice::SliceInfoSeq slices; // Preserved slices. - IndexListList indirectionTables; - - // Slice attributes - Ice::Byte sliceFlags; - Ice::Int sliceSize; - std::string typeId; - int compactId; - IndirectPatchList indirectPatchList; - - InstanceData* previous; - InstanceData* next; - }; - InstanceData _preAllocatedInstanceData; - InstanceData* _current; - - void push(SliceType sliceType) - { - if(!_current) - { - _current = &_preAllocatedInstanceData; - } - else - { - _current = _current->next ? _current->next : new InstanceData(_current); - } - _current->sliceType = sliceType; - _current->skipFirstSlice = false; - } - - Ice::Int _objectIdIndex; // The ID of the next object to un-marshal. - }; - - class ICE_API EncapsEncoder : private ::IceUtil::noncopyable - { - public: - - virtual ~EncapsEncoder() { } - - virtual void write(const Ice::ValuePtr&) = 0; - virtual void write(const Ice::UserException&) = 0; - - virtual void startInstance(SliceType, const Ice::SlicedDataPtr&) = 0; - virtual void endInstance() = 0; - virtual void startSlice(const std::string&, int, bool) = 0; - virtual void endSlice() = 0; - - virtual bool writeOpt(Ice::Int, Ice::OptionalFormat) - { - return false; - } - - virtual void writePendingObjects() - { - } - - protected: - - EncapsEncoder(BasicStream* stream, WriteEncaps* encaps) : _stream(stream), _encaps(encaps), _typeIdIndex(0) - { - } - - Ice::Int registerTypeId(const std::string&); - - BasicStream* _stream; - WriteEncaps* _encaps; - - typedef std::map<Ice::ValuePtr, Ice::Int> PtrToIndexMap; - typedef std::map<std::string, Ice::Int> TypeIdWriteMap; - - // Encapsulation attributes for object marshalling. - PtrToIndexMap _marshaledMap; - - private: - - // Encapsulation attributes for object marshalling. - TypeIdWriteMap _typeIdMap; - Ice::Int _typeIdIndex; - }; - - class ICE_API EncapsEncoder10 : public EncapsEncoder - { - public: - - EncapsEncoder10(BasicStream* stream, WriteEncaps* encaps) : - EncapsEncoder(stream, encaps), _sliceType(NoSlice), _objectIdIndex(0) - { - } - - virtual void write(const Ice::ValuePtr&); - virtual void write(const Ice::UserException&); - - virtual void startInstance(SliceType, const Ice::SlicedDataPtr&); - virtual void endInstance(); - virtual void startSlice(const std::string&, int, bool); - virtual void endSlice(); - - virtual void writePendingObjects(); - - private: - - Ice::Int registerObject(const Ice::ValuePtr&); - - // Instance attributes - SliceType _sliceType; - - // Slice attributes - Container::size_type _writeSlice; // Position of the slice data members - - // Encapsulation attributes for object marshalling. - Ice::Int _objectIdIndex; - PtrToIndexMap _toBeMarshaledMap; - }; - - class ICE_API EncapsEncoder11 : public EncapsEncoder - { - public: - - EncapsEncoder11(BasicStream* stream, WriteEncaps* encaps) : - EncapsEncoder(stream, encaps), _preAllocatedInstanceData(0), _current(0), _objectIdIndex(1) - { - } - - virtual void write(const Ice::ValuePtr&); - virtual void write(const Ice::UserException&); - - virtual void startInstance(SliceType, const Ice::SlicedDataPtr&); - virtual void endInstance(); - virtual void startSlice(const std::string&, int, bool); - virtual void endSlice(); - - virtual bool writeOpt(Ice::Int, Ice::OptionalFormat); - - private: - - void writeSlicedData(const Ice::SlicedDataPtr&); - void writeInstance(const Ice::ValuePtr&); - - struct InstanceData - { - InstanceData(InstanceData* p) : previous(p), next(0) - { - if(previous) - { - previous->next = this; - } - } - - ~InstanceData() - { - if(next) - { - delete next; - } - } - - // Instance attributes - SliceType sliceType; - bool firstSlice; - - // Slice attributes - Ice::Byte sliceFlags; - Container::size_type writeSlice; // Position of the slice data members - Container::size_type sliceFlagsPos; // Position of the slice flags - PtrToIndexMap indirectionMap; - ObjectList indirectionTable; - - InstanceData* previous; - InstanceData* next; - }; - InstanceData _preAllocatedInstanceData; - InstanceData* _current; - - Ice::Int _objectIdIndex; // The ID of the next object to marhsal - }; - - class ReadEncaps : private ::IceUtil::noncopyable - { - public: - - ReadEncaps() : start(0), decoder(0), previous(0) - { - // Inlined for performance reasons. - } - ~ReadEncaps() - { - // Inlined for performance reasons. - delete decoder; - } - void reset() - { - // Inlined for performance reasons. - delete decoder; - decoder = 0; - - previous = 0; - } - - Container::size_type start; - Ice::Int sz; - Ice::EncodingVersion encoding; - - EncapsDecoder* decoder; - - ReadEncaps* previous; - }; - - class WriteEncaps : private ::IceUtil::noncopyable - { - - public: - - WriteEncaps() : format(Ice::DefaultFormat), encoder(0), previous(0) - { - // Inlined for performance reasons. - } - ~WriteEncaps() - { - // Inlined for performance reasons. - delete encoder; - } - void reset() - { - // Inlined for performance reasons. - delete encoder; - encoder = 0; - - previous = 0; - } - - Container::size_type start; - Ice::EncodingVersion encoding; - Ice::FormatType format; - - EncapsEncoder* encoder; - - WriteEncaps* previous; - }; - - // - // The encoding version to use when there's no encapsulation to - // read from or write to. This is for example used to read message - // headers or when the user is using the streaming API with no - // encapsulation. - // - Ice::EncodingVersion _encoding; - - ReadEncaps* _currentReadEncaps; - WriteEncaps* _currentWriteEncaps; - - void initReadEncaps(); - void initWriteEncaps(); - - ReadEncaps _preAllocatedReadEncaps; - WriteEncaps _preAllocatedWriteEncaps; - - bool _sliceObjects; - - const IceUtil::StringConverterPtr _stringConverter; - const IceUtil::WstringConverterPtr _wstringConverter; - - int _startSeq; - int _minSeqSize; -}; - -} // End namespace IceInternal - -#endif diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h index 86091b15258..56966089c06 100644 --- a/cpp/include/Ice/Buffer.h +++ b/cpp/include/Ice/Buffer.h @@ -21,6 +21,8 @@ public: Buffer() : i(b.begin()) { } Buffer(const Ice::Byte* beg, const Ice::Byte* end) : b(beg, end), i(b.begin()) { } + Buffer(const std::vector<Ice::Byte>& v) : b(v), i(b.begin()) { } + Buffer(Buffer& o, bool adopt) : b(o.b, adopt), i(b.begin()) { } virtual ~Buffer() { } void swapBuffer(Buffer&); @@ -43,6 +45,8 @@ public: Container(); Container(const_iterator, const_iterator); + Container(const std::vector<value_type>&); + Container(Container&, bool); ~Container(); diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h index 63780ae93b3..349e9ef5d78 100644 --- a/cpp/include/Ice/Exception.h +++ b/cpp/include/Ice/Exception.h @@ -16,13 +16,10 @@ #include <Ice/Handle.h> #include <Ice/ObjectF.h> #include <Ice/ValueF.h> -#include <Ice/StreamF.h> namespace IceInternal { -class BasicStream; - namespace Ex { @@ -37,6 +34,9 @@ ICE_API void throwMarshalException(const char*, int, const std::string&); namespace Ice { +class OutputStream; +class InputStream; + typedef IceUtil::Exception Exception; class ICE_API LocalException : public IceUtil::Exception @@ -69,21 +69,15 @@ public: #endif virtual void ice_throw() const = 0; - virtual void __write(::IceInternal::BasicStream*) const; - virtual void __read(::IceInternal::BasicStream*); - - virtual void __write(const OutputStreamPtr&) const; - virtual void __read(const InputStreamPtr&); + virtual void __write(::Ice::OutputStream*) const; + virtual void __read(::Ice::InputStream*); virtual bool __usesClasses() const; protected: - virtual void __writeImpl(::IceInternal::BasicStream*) const = 0; - virtual void __readImpl(::IceInternal::BasicStream*) = 0; - - virtual void __writeImpl(const OutputStreamPtr&) const; - virtual void __readImpl(const InputStreamPtr&); + virtual void __writeImpl(::Ice::OutputStream*) const = 0; + virtual void __readImpl(::Ice::InputStream*) = 0; }; typedef ::IceInternal::Handle<UserException> UserExceptionPtr; diff --git a/cpp/include/Ice/FactoryTable.h b/cpp/include/Ice/FactoryTable.h index 8b6c8d1ad2a..03362685c43 100644 --- a/cpp/include/Ice/FactoryTable.h +++ b/cpp/include/Ice/FactoryTable.h @@ -14,7 +14,6 @@ #include <Ice/UserExceptionFactory.h> #include <Ice/ValueFactory.h> - namespace Ice { @@ -35,8 +34,8 @@ class ICE_API FactoryTable : private IceUtil::noncopyable { public: - void addExceptionFactory(const ::std::string&, const IceInternal::UserExceptionFactoryPtr&); - IceInternal::UserExceptionFactoryPtr getExceptionFactory(const ::std::string&) const; + void addExceptionFactory(const ::std::string&, const Ice::UserExceptionFactoryPtr&); + Ice::UserExceptionFactoryPtr getExceptionFactory(const ::std::string&) const; void removeExceptionFactory(const ::std::string&); #ifdef ICE_CPP11_MAPPING @@ -55,7 +54,7 @@ private: IceUtil::Mutex _m; - typedef ::std::pair<IceInternal::UserExceptionFactoryPtr, int> EFPair; + typedef ::std::pair<Ice::UserExceptionFactoryPtr, int> EFPair; typedef ::std::map< ::std::string, EFPair> EFTable; EFTable _eft; diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h index 84b30cba8f1..765004c06f6 100644 --- a/cpp/include/Ice/Ice.h +++ b/cpp/include/Ice/Ice.h @@ -37,7 +37,6 @@ #include <Ice/Connection.h> #include <Ice/ConnectionAsync.h> #include <Ice/Functional.h> -#include <Ice/Stream.h> #include <Ice/ImplicitContext.h> #include <Ice/Locator.h> #include <Ice/Router.h> diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h index b0b26542c83..d95fb113731 100644 --- a/cpp/include/Ice/Incoming.h +++ b/cpp/include/Ice/Incoming.h @@ -14,7 +14,8 @@ #include <Ice/ConnectionIF.h> #include <Ice/ServantLocatorF.h> #include <Ice/ServantManagerF.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/Object.h> #include <Ice/Current.h> #include <Ice/IncomingAsyncF.h> @@ -32,7 +33,7 @@ public: void __adopt(IncomingBase&); - BasicStream* __startWriteParams(Ice::FormatType); + Ice::OutputStream* __startWriteParams(Ice::FormatType); void __endWriteParams(bool); void __writeEmptyParams(); void __writeParamEncaps(const Ice::Byte*, Ice::Int, bool); @@ -64,7 +65,7 @@ protected: bool _response; Ice::Byte _compress; - BasicStream _os; + Ice::OutputStream _os; // // Optimization. The request handler may not be deleted while a @@ -97,34 +98,34 @@ public: return _inParamPos != 0; } - void invoke(const ServantManagerPtr&, BasicStream*); + void invoke(const ServantManagerPtr&, Ice::InputStream*); // Inlined for speed optimization. - BasicStream* startReadParams() + Ice::InputStream* startReadParams() { // // Remember the encoding used by the input parameters, we'll // encode the response parameters with the same encoding. // - _current.encoding = _is->startReadEncaps(); + _current.encoding = _is->startEncapsulation(); return _is; } void endReadParams() const { - _is->endReadEncaps(); + _is->endEncapsulation(); } void readEmptyParams() { - _current.encoding = _is->skipEmptyEncaps(); + _current.encoding = _is->skipEmptyEncapsulation(); } void readParamEncaps(const Ice::Byte*& v, Ice::Int& sz) { - _current.encoding = _is->readEncaps(v, sz); + _current.encoding = _is->readEncapsulation(v, sz); } private: - BasicStream* _is; + Ice::InputStream* _is; IncomingAsyncPtr _cb; Ice::Byte* _inParamPos; diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 8a892877555..6b060f07106 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -15,7 +15,6 @@ #include <Ice/PropertiesF.h> #include <Ice/InstanceF.h> #include <Ice/LoggerF.h> -#include <Ice/StreamF.h> #include <Ice/InstrumentationF.h> #include <Ice/Dispatcher.h> #include <Ice/FactoryTable.h> @@ -99,6 +98,7 @@ struct InitializationData CompactIdResolverPtr compactIdResolver; BatchRequestInterceptorPtr batchRequestInterceptor; #endif + ValueFactoryManagerPtr valueFactoryManager; }; ICE_API CommunicatorPtr initialize(int&, char*[], const InitializationData& = InitializationData(), @@ -110,32 +110,12 @@ ICE_API CommunicatorPtr initialize(Ice::StringSeq&, const InitializationData& = ICE_API CommunicatorPtr initialize(const InitializationData& = InitializationData(), Int = ICE_INT_VERSION); -ICE_API InputStreamPtr createInputStream(const CommunicatorPtr&, const ::std::vector< Byte >&); -ICE_API InputStreamPtr createInputStream(const CommunicatorPtr&, const ::std::vector< Byte >&, - const EncodingVersion&); -ICE_API InputStreamPtr wrapInputStream(const CommunicatorPtr&, const ::std::vector< Byte >&); -ICE_API InputStreamPtr wrapInputStream(const CommunicatorPtr&, const ::std::vector< Byte >&, const EncodingVersion&); -ICE_API InputStreamPtr createInputStream(const CommunicatorPtr&, - const ::std::pair< const Ice::Byte*, const Ice::Byte*>&); -ICE_API InputStreamPtr createInputStream(const CommunicatorPtr&, - const ::std::pair< const Ice::Byte*, const Ice::Byte*>&, - const EncodingVersion&); -ICE_API InputStreamPtr wrapInputStream(const CommunicatorPtr&, - const ::std::pair< const Ice::Byte*, const Ice::Byte*>&); -ICE_API InputStreamPtr wrapInputStream(const CommunicatorPtr&, - const ::std::pair< const Ice::Byte*, const Ice::Byte*>&, - const EncodingVersion&); - -ICE_API OutputStreamPtr createOutputStream(const CommunicatorPtr&); -ICE_API OutputStreamPtr createOutputStream(const CommunicatorPtr&, const EncodingVersion&); - ICE_API LoggerPtr getProcessLogger(); ICE_API void setProcessLogger(const LoggerPtr&); typedef Ice::Plugin* (*PluginFactory)(const ::Ice::CommunicatorPtr&, const std::string&, const ::Ice::StringSeq&); ICE_API void registerPluginFactory(const std::string&, PluginFactory, bool); - // // RAII helper class // diff --git a/cpp/include/Ice/InputStream.h b/cpp/include/Ice/InputStream.h new file mode 100644 index 00000000000..0e1aea08587 --- /dev/null +++ b/cpp/include/Ice/InputStream.h @@ -0,0 +1,944 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_INPUT_STREAM_H +#define ICE_INPUT_STREAM_H + +#include <IceUtil/StringConverter.h> +#include <Ice/CommunicatorF.h> +#include <Ice/InstanceF.h> +#include <Ice/Object.h> +#include <Ice/ValueF.h> +#include <Ice/ProxyF.h> +#include <Ice/LoggerF.h> +#include <Ice/ValueFactory.h> +#include <Ice/Buffer.h> +#include <Ice/Protocol.h> +#include <Ice/SlicedDataF.h> +#include <Ice/UserExceptionFactory.h> +#include <Ice/StreamHelpers.h> +#include <Ice/FactoryTable.h> +#include <Ice/Traits.h> + +namespace Ice +{ + +class UserException; + +template<typename T> inline void +patchHandle(void* addr, const ValuePtr& v) +{ +#ifdef ICE_CPP11_MAPPING + ::std::shared_ptr<T>* handle = static_cast<::std::shared_ptr<T>*>(addr); + *handle = ::std::dynamic_pointer_cast<T>(v); + if(v && !(*handle)) + { + IceInternal::Ex::throwUOE(T::ice_staticId(), v); + } +#else + IceInternal::Handle<T>* p = static_cast<IceInternal::Handle<T>*>(addr); + __patch(*p, v); // Generated __patch method, necessary for forward declarations. +#endif +} + +class ICE_API InputStream : public IceInternal::Buffer +{ +public: + + typedef size_t size_type; + typedef void (*PatchFunc)(void*, const ValuePtr&); + + // + // These constructors use the latest encoding version. Without a communicator, the stream + // will not be able to unmarshal a proxy. For other unmarshaling tasks, you can provide + // Helpers for objects that are normally provided by a communicator. + // + InputStream(); + InputStream(const std::vector<Byte>&); + InputStream(const std::pair<const Byte*, const Byte*>&); + InputStream(IceInternal::Buffer&, bool = false); + + // + // These constructors use the communicator's default encoding version. + // + InputStream(const CommunicatorPtr&); + InputStream(const CommunicatorPtr&, const std::vector<Byte>&); + InputStream(const CommunicatorPtr&, const std::pair<const Byte*, const Byte*>&); + InputStream(const CommunicatorPtr&, IceInternal::Buffer&, bool = false); + + // + // These constructors use the given encoding version. Without a communicator, the stream + // will not be able to unmarshal a proxy. For other unmarshaling tasks, you can provide + // Helpers for objects that are normally provided by a communicator. + // + InputStream(const EncodingVersion&); + InputStream(const EncodingVersion&, const std::vector<Byte>&); + InputStream(const EncodingVersion&, const std::pair<const Byte*, const Byte*>&); + InputStream(const EncodingVersion&, IceInternal::Buffer&, bool = false); + + // + // These constructors use the given communicator and encoding version. + // + InputStream(const CommunicatorPtr&, const EncodingVersion&); + InputStream(const CommunicatorPtr&, const EncodingVersion&, const std::vector<Byte>&); + InputStream(const CommunicatorPtr&, const EncodingVersion&, const std::pair<const Byte*, const Byte*>&); + InputStream(const CommunicatorPtr&, const EncodingVersion&, IceInternal::Buffer&, bool = false); + + ~InputStream() + { + // Inlined for performance reasons. + + if(_currentEncaps != &_preAllocatedEncaps) + { + clear(); // Not inlined. + } + } + + // + // Use initialize() if you originally constructed the stream without a communicator. + // + void initialize(const CommunicatorPtr&); + void initialize(const CommunicatorPtr&, const EncodingVersion&); + + void clear(); + + // + // Must return Instance*, because we don't hold an InstancePtr for + // optimization reasons (see comments below). + // + IceInternal::Instance* instance() const { return _instance; } // Inlined for performance reasons. + + void setStringConverters(const IceUtil::StringConverterPtr&, const IceUtil::WstringConverterPtr&); + + void setValueFactoryManager(const ValueFactoryManagerPtr&); + + void setLogger(const LoggerPtr&); + +#ifdef ICE_CPP11_MAPPING + void setCompactIdResolver(std::function<std::string (int)>); +#else + void setCompactIdResolver(const CompactIdResolverPtr&); +#endif + +#ifndef ICE_CPP11_MAPPING + void setCollectObjects(bool); +#endif + + void setSliceObjects(bool); + + void setTraceSlicing(bool); + + void* getClosure() const; + void* setClosure(void*); + + void swap(InputStream&); + + void resetEncapsulation(); + + void resize(Container::size_type sz) + { + b.resize(sz); + i = b.end(); + } + + void startObject() + { + assert(_currentEncaps && _currentEncaps->decoder); + _currentEncaps->decoder->startInstance(ObjectSlice); + } + SlicedDataPtr endObject(bool preserve) + { + assert(_currentEncaps && _currentEncaps->decoder); + return _currentEncaps->decoder->endInstance(preserve); + } + + void startException() + { + assert(_currentEncaps && _currentEncaps->decoder); + _currentEncaps->decoder->startInstance(ExceptionSlice); + } + SlicedDataPtr endException(bool preserve) + { + assert(_currentEncaps && _currentEncaps->decoder); + return _currentEncaps->decoder->endInstance(preserve); + } + + const EncodingVersion& startEncapsulation() + { + Encaps* oldEncaps = _currentEncaps; + if(!oldEncaps) // First allocated encaps? + { + _currentEncaps = &_preAllocatedEncaps; + } + else + { + _currentEncaps = new Encaps(); + _currentEncaps->previous = oldEncaps; + } + _currentEncaps->start = i - b.begin(); + + // + // I don't use readSize() and writeSize() for encapsulations, + // because when creating an encapsulation, I must know in advance + // how many bytes the size information will require in the data + // stream. If I use an Int, it is always 4 bytes. For + // readSize()/writeSize(), it could be 1 or 5 bytes. + // + Int sz; + read(sz); + if(sz < 6) + { + throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); + } + if(i - sizeof(Int) + sz > b.end()) + { + throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); + } + _currentEncaps->sz = sz; + + read(_currentEncaps->encoding); + IceInternal::checkSupportedEncoding(_currentEncaps->encoding); // Make sure the encoding is supported + + return _currentEncaps->encoding; + } + + void endEncapsulation() + { + assert(_currentEncaps); + + if(_currentEncaps->encoding != Encoding_1_0) + { + skipOpts(); + if(i != b.begin() + _currentEncaps->start + _currentEncaps->sz) + { + throwEncapsulationException(__FILE__, __LINE__); + } + } + else if(i != b.begin() + _currentEncaps->start + _currentEncaps->sz) + { + if(i + 1 != b.begin() + _currentEncaps->start + _currentEncaps->sz) + { + throwEncapsulationException(__FILE__, __LINE__); + } + + // + // Ice version < 3.3 had a bug where user exceptions with + // class members could be encoded with a trailing byte + // when dispatched with AMD. So we tolerate an extra byte + // in the encapsulation. + // + ++i; + } + + Encaps* oldEncaps = _currentEncaps; + _currentEncaps = _currentEncaps->previous; + if(oldEncaps == &_preAllocatedEncaps) + { + oldEncaps->reset(); + } + else + { + delete oldEncaps; + } + } + + EncodingVersion skipEmptyEncapsulation() + { + Int sz; + read(sz); + if(sz != static_cast<Int>(sizeof(Int)) + 2) + { + throwEncapsulationException(__FILE__, __LINE__); + } + + if(i + 2 > b.end()) + { + throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); + } + + EncodingVersion encoding; + read(encoding); + return encoding; + } + + EncodingVersion readEncapsulation(const Byte*& v, Int& sz) + { + EncodingVersion encoding; + v = i; + read(sz); + if(sz < 6) + { + throwEncapsulationException(__FILE__, __LINE__); + } + if(i - sizeof(Int) + sz > b.end()) + { + throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); + } + + read(encoding); + i += sz - sizeof(Int) - 2; + return encoding; + } + + const EncodingVersion& getEncoding() const + { + return _currentEncaps ? _currentEncaps->encoding : _encoding; + } + + Int getEncapsSize(); + EncodingVersion skipEncapsulation(); + + std::string startSlice() + { + assert(_currentEncaps && _currentEncaps->decoder); + return _currentEncaps->decoder->startSlice(); + } + void endSlice() + { + assert(_currentEncaps && _currentEncaps->decoder); + _currentEncaps->decoder->endSlice(); + } + void skipSlice() + { + assert(_currentEncaps && _currentEncaps->decoder); + _currentEncaps->decoder->skipSlice(); + } + + void readPendingObjects(); + + Int readSize() // Inlined for performance reasons. + { + Byte byte; + read(byte); + unsigned char val = static_cast<unsigned char>(byte); + if(val == 255) + { + Int v; + read(v); + if(v < 0) + { + throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); + } + return v; + } + else + { + return static_cast<Int>(static_cast<unsigned char>(byte)); + } + } + + Int readAndCheckSeqSize(int); + + void readBlob(std::vector<Byte>&, Int); + + void readBlob(const Byte*& v, Container::size_type sz) + { + if(sz > 0) + { + v = i; + if(static_cast<Container::size_type>(b.end() - i) < sz) + { + throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); + } + i += sz; + } + else + { + v = i; + } + } + + template<typename T> void read(T& v) + { + StreamHelper<T, StreamableTraits<T>::helper>::read(this, v); + } + + template<typename T> void read(Int tag, IceUtil::Optional<T>& v) + { + if(readOpt(tag, StreamOptionalHelper<T, + StreamableTraits<T>::helper, + StreamableTraits<T>::fixedLength>::optionalFormat)) + { + v.__setIsSet(); + StreamOptionalHelper<T, + StreamableTraits<T>::helper, + StreamableTraits<T>::fixedLength>::read(this, *v); + } + else + { + v = IceUtil::None; + } + } + + // Read type and tag for optionals + bool readOpt(Int tag, OptionalFormat expectedFormat) + { + assert(_currentEncaps); + if(_currentEncaps->decoder) + { + return _currentEncaps->decoder->readOpt(tag, expectedFormat); + } + else + { + return readOptImpl(tag, expectedFormat); + } + } + + // Byte + void read(Byte& v) + { + if(i >= b.end()) + { + throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); + } + v = *i++; + } + void read(std::vector<Byte>&); + void read(std::pair<const Byte*, const Byte*>&); + + // This method is useful for generic stream helpers + void read(std::pair<const Byte*, const Byte*>& p, ::IceUtil::ScopedArray<Byte>& result) + { + result.reset(); + read(p); + } + + // Bool + void read(bool& v) + { + if(i >= b.end()) + { + throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); + } + v = (0 != *i++); + } + void read(std::vector<bool>&); + void read(std::pair<const bool*, const bool*>&, ::IceUtil::ScopedArray<bool>&); + + // Short + void read(Short&); + void read(std::vector<Short>&); + void read(std::pair<const Short*, const Short*>&, ::IceUtil::ScopedArray<Short>&); + + // Int + void read(Int& v) // Inlined for performance reasons. + { + if(b.end() - i < static_cast<int>(sizeof(Int))) + { + throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); + } + const Byte* src = &(*i); + i += sizeof(Int); +#ifdef ICE_BIG_ENDIAN + Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Int) - 1; + *dest-- = *src++; + *dest-- = *src++; + *dest-- = *src++; + *dest = *src; +#else + Byte* dest = reinterpret_cast<Byte*>(&v); + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest = *src; +#endif + } + + void read(std::vector<Int>&); + void read(std::pair<const Int*, const Int*>&, ::IceUtil::ScopedArray<Int>&); + + // Long + + void read(Long&); + void read(std::vector<Long>&); + void read(std::pair<const Long*, const Long*>&, ::IceUtil::ScopedArray<Long>&); + + // Float + void read(Float&); + void read(std::vector<Float>&); + void read(std::pair<const Float*, const Float*>&, ::IceUtil::ScopedArray<Float>&); + + // Double + void read(Double&); + void read(std::vector<Double>&); + void read(std::pair<const Double*, const Double*>&, ::IceUtil::ScopedArray<Double>&); + + // String + void read(std::string& v, bool convert = true) + { + Int sz = readSize(); + if(sz > 0) + { + if(b.end() - i < sz) + { + throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); + } + if(convert && _stringConverter) + { + readConverted(v, sz); + } + else + { + std::string(reinterpret_cast<const char*>(&*i), reinterpret_cast<const char*>(&*i) + sz).swap(v); + } + i += sz; + } + else + { + v.clear(); + } + } + + // For custom strings, convert = false + void read(const char*& vdata, size_t& vsize) + { + Int sz = readSize(); + if(sz > 0) + { + if(b.end() - i < sz) + { + throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); + } + + vdata = reinterpret_cast<const char*>(&*i); + vsize = static_cast<size_t>(sz); + i += sz; + } + else + { + vdata = 0; + vsize = 0; + } + } + + // For custom strings, convert = true + void read(const char*& vdata, size_t& vsize, std::string& holder) + { + if(!_stringConverter) + { + holder.clear(); + read(vdata, vsize); + } + else + { + Int sz = readSize(); + if(sz > 0) + { + if(b.end() - i < sz) + { + throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); + } + + readConverted(holder, sz); + vdata = holder.data(); + vsize = holder.size(); + } + else + { + holder.clear(); + vdata = 0; + vsize = 0; + } + } + } + + void read(std::vector<std::string>&, bool = true); + + void read(std::wstring&); + void read(std::vector<std::wstring>&); + + // Proxy +#ifdef ICE_CPP11_MAPPING + std::shared_ptr<ObjectPrx> readProxy(); + + template<typename T, typename ::std::enable_if<::std::is_base_of<ObjectPrx, T>::value>::type* = nullptr> + void read(::std::shared_ptr<T>& v) + { + ::std::shared_ptr<ObjectPrx> proxy(readProxy()); + if(!proxy) + { + v = 0; + } + else + { + v = ::IceInternal::createProxy<T>(); + v->__copyFrom(proxy); + } + } +#else + void read(ObjectPrx&); + template<typename T> void read(IceInternal::ProxyHandle<T>& v) + { + __read(this, v); // Generated __read method, necessary for forward declarations. + } +#endif + + // Class +#ifdef ICE_CPP11_MAPPING // C++11 mapping + template<typename T, typename ::std::enable_if<::std::is_base_of<Value, T>::value>::type* = nullptr> + void read(::std::shared_ptr<T>& v) + { + read(&patchHandle<T>, &v); + } +#else // C++98 mapping + template<typename T> void read(IceInternal::Handle<T>& v) + { + read(&patchHandle<T>, &v); + } +#endif + + void read(PatchFunc patchFunc, void* patchAddr) + { + initEncaps(); + _currentEncaps->decoder->read(patchFunc, patchAddr); + } + + // Enum + Int readEnum(Int); + + // Exception + void throwException(const Ice::UserExceptionFactoryPtr& = 0); + + // Read/write/skip optionals + bool readOptImpl(Int, OptionalFormat); + void skipOpt(OptionalFormat); + void skipOpts(); + + // Skip bytes from the stream + void skip(size_type size) + { + if(i + size > b.end()) + { + throwUnmarshalOutOfBoundsException(__FILE__, __LINE__); + } + i += size; + } + void skipSize() + { + Byte bt; + read(bt); + if(static_cast<unsigned char>(bt) == 255) + { + skip(4); + } + } + + size_type pos() + { + return i - b.begin(); + } + + InputStream(IceInternal::Instance*, const EncodingVersion&); + InputStream(IceInternal::Instance*, const EncodingVersion&, IceInternal::Buffer&, bool = false); + + void initialize(IceInternal::Instance*, const EncodingVersion&); + +private: + + void initialize(const EncodingVersion&); + + // + // String + // + void readConverted(std::string&, Int); + + // + // We can't throw these exception from inline functions from within + // this file, because we cannot include the header with the + // exceptions. Doing so would screw up the whole include file + // ordering. + // + void throwUnmarshalOutOfBoundsException(const char*, int); + void throwEncapsulationException(const char*, int); + + std::string resolveCompactId(int) const; + + void postUnmarshal(const ValuePtr&) const; + + class Encaps; + enum SliceType { NoSlice, ObjectSlice, ExceptionSlice }; + + void traceSkipSlice(const std::string&, SliceType) const; + + ValueFactoryManagerPtr valueFactoryManager() const; + + LoggerPtr logger() const; + +#ifdef ICE_CPP11_MAPPING + std::function<std::string (int)> compactIdResolver() const; +#else + CompactIdResolverPtr compactIdResolver() const; +#endif + + // + // Optimization. The instance may not be deleted while a + // stack-allocated stream still holds it. + // + IceInternal::Instance* _instance; + + typedef std::vector<ValuePtr> ObjectList; + + class ICE_API EncapsDecoder : private ::IceUtil::noncopyable + { + public: + + virtual ~EncapsDecoder() { } + + virtual void read(PatchFunc, void*) = 0; + virtual void throwException(const Ice::UserExceptionFactoryPtr&) = 0; + + virtual void startInstance(SliceType) = 0; + virtual SlicedDataPtr endInstance(bool) = 0; + virtual const std::string& startSlice() = 0; + virtual void endSlice() = 0; + virtual void skipSlice() = 0; + + virtual bool readOpt(Int, OptionalFormat) + { + return false; + } + + virtual void readPendingObjects() + { + } + + protected: + + EncapsDecoder(InputStream* stream, Encaps* encaps, bool sliceObjects, const Ice::ValueFactoryManagerPtr& f) : + _stream(stream), _encaps(encaps), _sliceObjects(sliceObjects), _valueFactoryManager(f), _typeIdIndex(0) + { + } + + std::string readTypeId(bool); + ValuePtr newInstance(const std::string&); + + void addPatchEntry(Int, PatchFunc, void*); + void unmarshal(Int, const ValuePtr&); + + typedef std::map<Int, ValuePtr> IndexToPtrMap; + typedef std::map<Int, std::string> TypeIdMap; + + struct PatchEntry + { + PatchFunc patchFunc; + void* patchAddr; + }; + typedef std::vector<PatchEntry> PatchList; + typedef std::map<Int, PatchList> PatchMap; + + InputStream* _stream; + Encaps* _encaps; + const bool _sliceObjects; + Ice::ValueFactoryManagerPtr _valueFactoryManager; + + // Encapsulation attributes for object un-marshalling + PatchMap _patchMap; + + private: + + // Encapsulation attributes for object un-marshalling + IndexToPtrMap _unmarshaledMap; + TypeIdMap _typeIdMap; + Int _typeIdIndex; + ObjectList _objectList; + }; + + class ICE_API EncapsDecoder10 : public EncapsDecoder + { + public: + + EncapsDecoder10(InputStream* stream, Encaps* encaps, bool sliceObjects, const Ice::ValueFactoryManagerPtr& f) : + EncapsDecoder(stream, encaps, sliceObjects, f), _sliceType(NoSlice) + { + } + + virtual void read(PatchFunc, void*); + virtual void throwException(const Ice::UserExceptionFactoryPtr&); + + virtual void startInstance(SliceType); + virtual SlicedDataPtr endInstance(bool); + virtual const std::string& startSlice(); + virtual void endSlice(); + virtual void skipSlice(); + + virtual void readPendingObjects(); + + private: + + void readInstance(); + + // Instance attributes + SliceType _sliceType; + bool _skipFirstSlice; + + // Slice attributes + Int _sliceSize; + std::string _typeId; + }; + + class ICE_API EncapsDecoder11 : public EncapsDecoder + { + public: + + EncapsDecoder11(InputStream* stream, Encaps* encaps, bool sliceObjects, const Ice::ValueFactoryManagerPtr& f) : + EncapsDecoder(stream, encaps, sliceObjects, f), _preAllocatedInstanceData(0), _current(0), _objectIdIndex(1) + { + } + + virtual void read(PatchFunc, void*); + virtual void throwException(const Ice::UserExceptionFactoryPtr&); + + virtual void startInstance(SliceType); + virtual SlicedDataPtr endInstance(bool); + virtual const std::string& startSlice(); + virtual void endSlice(); + virtual void skipSlice(); + + virtual bool readOpt(Int, OptionalFormat); + + private: + + Int readInstance(Int, PatchFunc, void*); + SlicedDataPtr readSlicedData(); + + struct IndirectPatchEntry + { + Int index; + PatchFunc patchFunc; + void* patchAddr; + }; + typedef std::vector<IndirectPatchEntry> IndirectPatchList; + + typedef std::vector<Int> IndexList; + typedef std::vector<IndexList> IndexListList; + + struct InstanceData + { + InstanceData(InstanceData* p) : previous(p), next(0) + { + if(previous) + { + previous->next = this; + } + } + + ~InstanceData() + { + if(next) + { + delete next; + } + } + + // Instance attributes + SliceType sliceType; + bool skipFirstSlice; + SliceInfoSeq slices; // Preserved slices. + IndexListList indirectionTables; + + // Slice attributes + Byte sliceFlags; + Int sliceSize; + std::string typeId; + int compactId; + IndirectPatchList indirectPatchList; + + InstanceData* previous; + InstanceData* next; + }; + InstanceData _preAllocatedInstanceData; + InstanceData* _current; + + void push(SliceType sliceType) + { + if(!_current) + { + _current = &_preAllocatedInstanceData; + } + else + { + _current = _current->next ? _current->next : new InstanceData(_current); + } + _current->sliceType = sliceType; + _current->skipFirstSlice = false; + } + + Int _objectIdIndex; // The ID of the next object to un-marshal. + }; + + class Encaps : private ::IceUtil::noncopyable + { + public: + + Encaps() : start(0), decoder(0), previous(0) + { + // Inlined for performance reasons. + } + ~Encaps() + { + // Inlined for performance reasons. + delete decoder; + } + void reset() + { + // Inlined for performance reasons. + delete decoder; + decoder = 0; + + previous = 0; + } + + Container::size_type start; + Int sz; + EncodingVersion encoding; + + EncapsDecoder* decoder; + + Encaps* previous; + }; + + // + // The encoding version to use when there's no encapsulation to + // read from. This is for example used to read message headers. + // + EncodingVersion _encoding; + + Encaps* _currentEncaps; + + void initEncaps(); + + Encaps _preAllocatedEncaps; + +#ifndef ICE_CPP11_MAPPING + bool _collectObjects; +#endif + + bool _traceSlicing; + + void* _closure; + + bool _sliceObjects; + + int _startSeq; + int _minSeqSize; + + IceUtil::StringConverterPtr _stringConverter; + IceUtil::WstringConverterPtr _wstringConverter; + ValueFactoryManagerPtr _valueFactoryManager; + LoggerPtr _logger; +#ifdef ICE_CPP11_MAPPING + std::function<std::string (int)> _compactIdResolver; +#else + CompactIdResolverPtr _compactIdResolver; +#endif +}; + +} // End namespace Ice + +#endif diff --git a/cpp/include/Ice/InterfaceByValue.h b/cpp/include/Ice/InterfaceByValue.h index c2be72d3eb9..c32227a14d4 100644 --- a/cpp/include/Ice/InterfaceByValue.h +++ b/cpp/include/Ice/InterfaceByValue.h @@ -11,7 +11,8 @@ #define ICE_INTERFACE_BY_VALUE_H #include <Ice/Value.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #ifdef ICE_CPP11_MAPPING @@ -24,17 +25,17 @@ class InterfaceByValue : public Ice::ValueHelper<Ice::InterfaceByValue<T>, Ice:: public: virtual void - __writeImpl(::IceInternal::BasicStream* __os) const + __writeImpl(::Ice::OutputStream* __os) const { - __os->startWriteSlice(T::ice_staticId(), -1, true); - __os->endWriteSlice(); + __os->startSlice(T::ice_staticId(), -1, true); + __os->endSlice(); } virtual void - __readImpl(::IceInternal::BasicStream* __is) + __readImpl(::Ice::InputStream* __is) { - __is->startReadSlice(); - __is->endReadSlice(); + __is->startSlice(); + __is->endSlice(); } virtual const std::string& ice_id() const diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h index 1fbbdf153f1..bd5a3278a6e 100644 --- a/cpp/include/Ice/LocalObject.h +++ b/cpp/include/Ice/LocalObject.h @@ -13,13 +13,6 @@ #include <IceUtil/Shared.h> #include <Ice/LocalObjectF.h> -namespace IceInternal -{ - -class BasicStream; - -} - namespace Ice { diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h index 9dcaab32f2c..b057d6bfa16 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -16,14 +16,20 @@ #include <Ice/ProxyF.h> #include <Ice/IncomingAsyncF.h> #include <Ice/Current.h> -#include <Ice/StreamF.h> #include <Ice/Format.h> +namespace Ice +{ + +class OutputStream; +class InpputStream; + +} + namespace IceInternal { class Incoming; -class BasicStream; class Direct; class GCVisitor; @@ -116,11 +122,8 @@ public: virtual Int ice_operationAttributes(const std::string&) const; - virtual void __write(IceInternal::BasicStream*) const; - virtual void __read(IceInternal::BasicStream*); - - virtual void __write(const OutputStreamPtr&) const; - virtual void __read(const InputStreamPtr&); + virtual void __write(Ice::OutputStream*) const; + virtual void __read(Ice::InputStream*); virtual bool __gcVisit(IceInternal::GCVisitor&) { return false; }; virtual void ice_collectable(bool) { }; @@ -144,11 +147,8 @@ protected: protected: - virtual void __writeImpl(IceInternal::BasicStream*) const {} - virtual void __readImpl(IceInternal::BasicStream*) {} - - virtual void __writeImpl(const OutputStreamPtr&) const; - virtual void __readImpl(const InputStreamPtr&); + virtual void __writeImpl(Ice::OutputStream*) const {} + virtual void __readImpl(Ice::InputStream*) {} static void __checkMode(OperationMode, OperationMode); }; @@ -209,9 +209,6 @@ public: virtual DispatchStatus __dispatch(IceInternal::Incoming&, const Current&); }; -ICE_API void ice_writeObject(const OutputStreamPtr&, const ValuePtr&); -ICE_API void ice_readObject(const InputStreamPtr&, ValuePtr&); - } #endif diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h index e44c1660a4e..b86819cd8d7 100644 --- a/cpp/include/Ice/Outgoing.h +++ b/cpp/include/Ice/Outgoing.h @@ -18,7 +18,8 @@ #include <Ice/InstanceF.h> #include <Ice/ConnectionIF.h> #include <Ice/ReferenceF.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/Current.h> #include <Ice/ObserverHelper.h> #include <Ice/ObjectAdapterF.h> @@ -43,10 +44,10 @@ public: virtual void sent() = 0; virtual void completed(const Ice::Exception&) = 0; - virtual void completed(BasicStream&) = 0; + virtual void completed(Ice::InputStream&) = 0; virtual void retryException(const Ice::Exception&) = 0; - BasicStream* os() { return &_os; } + Ice::OutputStream* os() { return &_os; } void attachRemoteObserver(const Ice::ConnectionInfoPtr& c, const Ice::EndpointPtr& endpt, Ice::Int requestId) { @@ -64,7 +65,7 @@ protected: OutgoingBase(Instance*); - BasicStream _os; + Ice::OutputStream _os; #ifdef ICE_CPP11_MAPPING std::exception_ptr _exception; #else @@ -89,7 +90,7 @@ public: virtual void sent(); virtual void completed(const Ice::Exception&); - virtual void completed(BasicStream&); + virtual void completed(Ice::InputStream&); virtual void retryException(const Ice::Exception&); protected: @@ -130,49 +131,49 @@ public: bool invoke(); // Returns true if ok, false if user exception. void abort(const Ice::LocalException&); - virtual void completed(BasicStream&); + virtual void completed(Ice::InputStream&); // Inlined for speed optimization. - BasicStream* startReadParams() + Ice::InputStream* startReadParams() { - _is.startReadEncaps(); + _is.startEncapsulation(); return &_is; } void endReadParams() { - _is.endReadEncaps(); + _is.endEncapsulation(); } void readEmptyParams() { - _is.skipEmptyEncaps(); + _is.skipEmptyEncapsulation(); } void readParamEncaps(const Ice::Byte*& encaps, Ice::Int& sz) { - _is.readEncaps(encaps, sz); + _is.readEncapsulation(encaps, sz); } - BasicStream* startWriteParams(Ice::FormatType format) + Ice::OutputStream* startWriteParams(Ice::FormatType format) { - _os.startWriteEncaps(_encoding, format); + _os.startEncapsulation(_encoding, format); return &_os; } void endWriteParams() { - _os.endWriteEncaps(); + _os.endEncapsulation(); } void writeEmptyParams() { - _os.writeEmptyEncaps(_encoding); + _os.writeEmptyEncapsulation(_encoding); } void writeParamEncaps(const Ice::Byte* encaps, Ice::Int size) { if(size == 0) { - _os.writeEmptyEncaps(_encoding); + _os.writeEmptyEncapsulation(_encoding); } else { - _os.writeEncaps(encaps, size); + _os.writeEncapsulation(encaps, size); } } @@ -186,7 +187,7 @@ public: private: Ice::EncodingVersion _encoding; - BasicStream _is; + Ice::InputStream _is; const std::string& _operation; }; @@ -216,7 +217,7 @@ public: virtual void sent(); virtual void completed(const Ice::Exception&); - virtual void completed(BasicStream&); + virtual void completed(Ice::InputStream&); virtual void retryException(const Ice::Exception&); private: diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h index 61d962a0c7d..afcfc1d7fcc 100644 --- a/cpp/include/Ice/OutgoingAsync.h +++ b/cpp/include/Ice/OutgoingAsync.h @@ -16,6 +16,7 @@ #include <Ice/CommunicatorF.h> #include <Ice/ConnectionIF.h> #include <Ice/ObjectAdapterF.h> +#include <Ice/OutputStream.h> #include <exception> @@ -57,12 +58,12 @@ public: _childObserver.attach(getObserver().getCollocatedObserver(adapter, requestId, size)); } - BasicStream* getOs() + Ice::OutputStream* getOs() { return &_os; } - virtual BasicStream* getIs(); + virtual Ice::InputStream* getIs(); protected: @@ -77,7 +78,7 @@ protected: ObserverHelperT<Ice::Instrumentation::ChildInvocationObserver> _childObserver; - BasicStream _os; + Ice::OutputStream _os; }; // @@ -156,32 +157,32 @@ public: void invoke(); - BasicStream* startWriteParams(Ice::FormatType format) + Ice::OutputStream* startWriteParams(Ice::FormatType format) { - _os.startWriteEncaps(_encoding, format); + _os.startEncapsulation(_encoding, format); return &_os; } void endWriteParams() { - _os.endWriteEncaps(); + _os.endEncapsulation(); } void writeEmptyParams() { - _os.writeEmptyEncaps(_encoding); + _os.writeEmptyEncapsulation(_encoding); } void writeParamEncaps(const ::Ice::Byte* encaps, ::Ice::Int size) { if(size == 0) { - _os.writeEmptyEncaps(_encoding); + _os.writeEmptyEncapsulation(_encoding); } else { - _os.writeEncaps(encaps, size); + _os.writeEncapsulation(encaps, size); } } - virtual BasicStream* getIs() + virtual Ice::InputStream* getIs() { return &_is; } @@ -316,7 +317,7 @@ public: const std::shared_ptr<Ice::ObjectPrx>&, Ice::OperationMode, Ice::FormatType, - std::function<void (::IceInternal::BasicStream*)>, + std::function<void (::Ice::OutputStream*)>, std::function<void ()>, std::function<void (::std::exception_ptr)>, std::function<void (bool)>, @@ -338,7 +339,7 @@ public: TwowayClosureCallback(const std::string&, const std::shared_ptr<Ice::ObjectPrx>&, bool, - std::function<void (::IceInternal::BasicStream*)>, + std::function<void (::Ice::InputStream*)>, std::function<void (const ::Ice::UserException&)>, std::function<void (::std::exception_ptr)>, std::function<void (bool)>); @@ -357,9 +358,9 @@ public: const std::shared_ptr<Ice::ObjectPrx>&, Ice::OperationMode, Ice::FormatType, - std::function<void (::IceInternal::BasicStream*)>, + std::function<void (::Ice::OutputStream*)>, bool, - std::function<void (::IceInternal::BasicStream*)>, + std::function<void (::Ice::InputStream*)>, std::function<void (const ::Ice::UserException&)>, std::function<void (::std::exception_ptr)>, std::function<void (bool)>, @@ -370,7 +371,7 @@ private: const std::string& __name; std::shared_ptr<Ice::ObjectPrx> __proxy; bool __readEmptyParams; - std::function<void (::IceInternal::BasicStream*)> __read; + std::function<void (::Ice::InputStream*)> __read; std::function<void (const ::Ice::UserException&)> __userException; std::function<void (::std::exception_ptr)> __exception; std::function<void (bool)> __sent; diff --git a/cpp/include/Ice/OutputStream.h b/cpp/include/Ice/OutputStream.h new file mode 100644 index 00000000000..74594f1dc25 --- /dev/null +++ b/cpp/include/Ice/OutputStream.h @@ -0,0 +1,715 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_OUTPUT_STREAM_H +#define ICE_OUTPUT_STREAM_H + +#include <IceUtil/StringConverter.h> +#include <Ice/CommunicatorF.h> +#include <Ice/InstanceF.h> +#include <Ice/Object.h> +#include <Ice/ValueF.h> +#include <Ice/ProxyF.h> +#include <Ice/Buffer.h> +#include <Ice/Protocol.h> +#include <Ice/SlicedDataF.h> +#include <Ice/StreamHelpers.h> +#include <Ice/Traits.h> + +namespace Ice +{ + +class UserException; + +class ICE_API OutputStream : public IceInternal::Buffer +{ +public: + + typedef size_t size_type; + + // + // Constructing an OutputStream without providing a communicator means the stream will + // use the default encoding version, the default format for class encoding, and will not + // use string converters. You can supply a communicator later by calling initialize(). + // + OutputStream(); + + // + // This constructor uses the communicator's default encoding version. + // + OutputStream(const CommunicatorPtr&); + + // + // This constructor uses the given communicator and encoding version. + // + OutputStream(const CommunicatorPtr&, const EncodingVersion&); + + ~OutputStream() + { + // Inlined for performance reasons. + + if(_currentEncaps != &_preAllocatedEncaps) + { + clear(); // Not inlined. + } + } + + // + // Initializes the stream to use the communicator's default encoding version, class + // encoding format, and string converters. + // + void initialize(const CommunicatorPtr&); + + // + // Initializes the stream to use the given encoding version and the communicator's + // default class encoding format and string converters. + // + void initialize(const CommunicatorPtr&, const EncodingVersion&); + + void clear(); + + // + // Must return Instance*, because we don't hold an InstancePtr for + // optimization reasons (see comments below). + // + IceInternal::Instance* instance() const { return _instance; } // Inlined for performance reasons. + + void setStringConverters(const IceUtil::StringConverterPtr&, const IceUtil::WstringConverterPtr&); + + void setFormat(FormatType); + + void* getClosure() const; + void* setClosure(void*); + + void swap(OutputStream&); + void resetEncapsulation(); + + void resize(Container::size_type sz) + { + b.resize(sz); + i = b.end(); + } + + void startObject(const SlicedDataPtr& data) + { + assert(_currentEncaps && _currentEncaps->encoder); + _currentEncaps->encoder->startInstance(ObjectSlice, data); + } + void endObject() + { + assert(_currentEncaps && _currentEncaps->encoder); + _currentEncaps->encoder->endInstance(); + } + + void startException(const SlicedDataPtr& data) + { + assert(_currentEncaps && _currentEncaps->encoder); + _currentEncaps->encoder->startInstance(ExceptionSlice, data); + } + void endException() + { + assert(_currentEncaps && _currentEncaps->encoder); + _currentEncaps->encoder->endInstance(); + } + + void startEncapsulation(); + + void startEncapsulation(const EncodingVersion& encoding, FormatType format) + { + IceInternal::checkSupportedEncoding(encoding); + + Encaps* oldEncaps = _currentEncaps; + if(!oldEncaps) // First allocated encaps? + { + _currentEncaps = &_preAllocatedEncaps; + } + else + { + _currentEncaps = new Encaps(); + _currentEncaps->previous = oldEncaps; + } + _currentEncaps->format = format; + _currentEncaps->encoding = encoding; + _currentEncaps->start = b.size(); + + write(Int(0)); // Placeholder for the encapsulation length. + write(_currentEncaps->encoding); + } + void endEncapsulation() + { + assert(_currentEncaps); + + // Size includes size and version. + const Int sz = static_cast<Int>(b.size() - _currentEncaps->start); + write(sz, &(*(b.begin() + _currentEncaps->start))); + + Encaps* oldEncaps = _currentEncaps; + _currentEncaps = _currentEncaps->previous; + if(oldEncaps == &_preAllocatedEncaps) + { + oldEncaps->reset(); + } + else + { + delete oldEncaps; + } + } + + void writeEmptyEncapsulation(const EncodingVersion& encoding) + { + IceInternal::checkSupportedEncoding(encoding); + write(Int(6)); // Size + write(encoding); + } + void writeEncapsulation(const Byte* v, Int sz) + { + if(sz < 6) + { + throwEncapsulationException(__FILE__, __LINE__); + } + + Container::size_type position = b.size(); + resize(position + sz); + memcpy(&b[position], &v[0], sz); + } + + const EncodingVersion& getEncoding() const + { + return _currentEncaps ? _currentEncaps->encoding : _encoding; + } + + void startSlice(const std::string& typeId, int compactId, bool last) + { + assert(_currentEncaps && _currentEncaps->encoder); + _currentEncaps->encoder->startSlice(typeId, compactId, last); + } + void endSlice() + { + assert(_currentEncaps && _currentEncaps->encoder); + _currentEncaps->encoder->endSlice(); + } + + void writePendingObjects(); + + void writeSize(Int v) // Inlined for performance reasons. + { + assert(v >= 0); + if(v > 254) + { + write(Byte(255)); + write(v); + } + else + { + write(static_cast<Byte>(v)); + } + } + void rewriteSize(Int v, Container::iterator dest) + { + assert(v >= 0); + if(v > 254) + { + *dest++ = Byte(255); + write(v, dest); + } + else + { + *dest = static_cast<Byte>(v); + } + } + + size_type startSize() + { + size_type position = b.size(); + write(Int(0)); + return position; + } + + void endSize(size_type position) + { + rewrite(static_cast<Int>(b.size() - position) - 4, position); + } + + void writeBlob(const std::vector<Byte>&); + + void writeBlob(const Byte* v, Container::size_type sz) + { + if(sz > 0) + { + Container::size_type position = b.size(); + resize(position + sz); + memcpy(&b[position], &v[0], sz); + } + } + + template<typename T> void write(const T& v) + { + StreamHelper<T, StreamableTraits<T>::helper>::write(this, v); + } + + template<typename T> void write(Int tag, const IceUtil::Optional<T>& v) + { + if(!v) + { + return; // Optional not set + } + + if(writeOpt(tag, StreamOptionalHelper<T, + StreamableTraits<T>::helper, + StreamableTraits<T>::fixedLength>::optionalFormat)) + { + StreamOptionalHelper<T, + StreamableTraits<T>::helper, + StreamableTraits<T>::fixedLength>::write(this, *v); + } + } + + // + // Template functions for sequences and custom sequences + // + template<typename T> void write(const std::vector<T>& v) + { + if(v.empty()) + { + writeSize(0); + } + else + { + write(&v[0], &v[0] + v.size()); + } + } + template<typename T> void write(const T* begin, const T* end) + { + writeSize(static_cast<Int>(end - begin)); + for(const T* p = begin; p != end; ++p) + { + write(*p); + } + } + + // Write type and tag for optionals + bool writeOpt(Int tag, OptionalFormat format) + { + assert(_currentEncaps); + if(_currentEncaps->encoder) + { + return _currentEncaps->encoder->writeOpt(tag, format); + } + else + { + return writeOptImpl(tag, format); + } + } + + // Byte + void write(Byte v) + { + b.push_back(v); + } + void write(const Byte*, const Byte*); + + // Bool + void write(bool v) + { + b.push_back(static_cast<Byte>(v)); + } + void write(const std::vector<bool>&); + void write(const bool*, const bool*); + + // Short + void write(Short); + void write(const Short*, const Short*); + + // Int + void write(Int v) // Inlined for performance reasons. + { + Container::size_type position = b.size(); + resize(position + sizeof(Int)); + write(v, &b[position]); + } + void write(Int v, Container::iterator dest) + { +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Int) - 1; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest = *src; +#else + const Byte* src = reinterpret_cast<const Byte*>(&v); + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest = *src; +#endif + } + + void write(const Int*, const Int*); + + // Long + +#ifdef ICE_CPP11_MAPPING + void write(long long int); +#else + void write(Long); +#endif + + void write(const Long*, const Long*); + + // Float + void write(Float); + void write(const Float*, const Float*); + + // Double + void write(Double); + void write(const Double*, const Double*); + + // String + void write(const std::string& v, bool convert = true) + { + Int sz = static_cast<Int>(v.size()); + if(convert && sz > 0 && _stringConverter != 0) + { + writeConverted(v.data(), static_cast<size_t>(sz)); + } + else + { + writeSize(sz); + if(sz > 0) + { + Container::size_type position = b.size(); + resize(position + sz); + memcpy(&b[position], v.data(), sz); + } + } + } + + // for custom strings + void write(const char* vdata, size_t vsize, bool convert = true) + { + Int sz = static_cast<Int>(vsize); + if(convert && sz > 0 && _stringConverter != 0) + { + writeConverted(vdata, vsize); + } + else + { + writeSize(sz); + if(sz > 0) + { + Container::size_type position = b.size(); + resize(position + sz); + memcpy(&b[position], vdata, vsize); + } + } + } + + // Null-terminated C string + void write(const char* vdata, bool convert = true) + { + write(vdata, strlen(vdata), convert); + } + + void write(const std::string*, const std::string*, bool = true); + + void write(const std::wstring& v); + void write(const std::wstring*, const std::wstring*); + + // Proxy +#ifdef ICE_CPP11_MAPPING + void writeProxy(const ObjectPrxPtr&); + + template<typename T, typename ::std::enable_if<::std::is_base_of<ObjectPrx, T>::value>::type* = nullptr> + void write(const ::std::shared_ptr<T>& v) + { + writeProxy(::std::static_pointer_cast<ObjectPrx>(v)); + } +#else + void write(const ObjectPrx&); + template<typename T> void write(const IceInternal::ProxyHandle<T>& v) + { + write(ObjectPrx(upCast(v.get()))); + } +#endif + + // Class +#ifdef ICE_CPP11_MAPPING // C++11 mapping + template<typename T, typename ::std::enable_if<::std::is_base_of<Value, T>::value>::type* = nullptr> + void write(const ::std::shared_ptr<T>& v) + { + initEncaps(); + _currentEncaps->encoder->write(v); + } +#else // C++98 mapping + void write(const ObjectPtr& v) + { + initEncaps(); + _currentEncaps->encoder->write(v); + } + template<typename T> void write(const IceInternal::Handle<T>& v) + { + write(ObjectPtr(upCast(v.get()))); + } +#endif + + // Enum + void writeEnum(Int, Int); + + // Exception + void writeException(const UserException&); + + // Optionals + bool writeOptImpl(Int, OptionalFormat); + + size_type pos() + { + return i - b.begin(); + } + + void rewrite(Int value, size_type p) + { + write(value, b.begin() + p); + } + + OutputStream(IceInternal::Instance*, const EncodingVersion&); + + void initialize(IceInternal::Instance*, const EncodingVersion&); + + void finished(std::vector<Byte>&); + virtual std::pair<const Byte*, const Byte*> finished(); + +private: + + // + // String + // + void writeConverted(const char*, size_t); + + // + // We can't throw this exception from inline functions from within + // this file, because we cannot include the header with the + // exceptions. Doing so would screw up the whole include file + // ordering. + // + void throwEncapsulationException(const char*, int); + + // + // Optimization. The instance may not be deleted while a + // stack-allocated stream still holds it. + // + IceInternal::Instance* _instance; + + // + // The public stream API needs to attach data to a stream. + // + void* _closure; + + class Encaps; + enum SliceType { NoSlice, ObjectSlice, ExceptionSlice }; + + typedef std::vector<ValuePtr> ObjectList; + + class ICE_API EncapsEncoder : private ::IceUtil::noncopyable + { + public: + + virtual ~EncapsEncoder() { } + + virtual void write(const ValuePtr&) = 0; + virtual void write(const UserException&) = 0; + + virtual void startInstance(SliceType, const SlicedDataPtr&) = 0; + virtual void endInstance() = 0; + virtual void startSlice(const std::string&, int, bool) = 0; + virtual void endSlice() = 0; + + virtual bool writeOpt(Int, OptionalFormat) + { + return false; + } + + virtual void writePendingObjects() + { + } + + protected: + + EncapsEncoder(OutputStream* stream, Encaps* encaps) : _stream(stream), _encaps(encaps), _typeIdIndex(0) + { + } + + Int registerTypeId(const std::string&); + + OutputStream* _stream; + Encaps* _encaps; + + typedef std::map<ValuePtr, Int> PtrToIndexMap; + typedef std::map<std::string, Int> TypeIdMap; + + // Encapsulation attributes for object marshalling. + PtrToIndexMap _marshaledMap; + + private: + + // Encapsulation attributes for object marshalling. + TypeIdMap _typeIdMap; + Int _typeIdIndex; + }; + + class ICE_API EncapsEncoder10 : public EncapsEncoder + { + public: + + EncapsEncoder10(OutputStream* stream, Encaps* encaps) : + EncapsEncoder(stream, encaps), _sliceType(NoSlice), _objectIdIndex(0) + { + } + + virtual void write(const ValuePtr&); + virtual void write(const UserException&); + + virtual void startInstance(SliceType, const SlicedDataPtr&); + virtual void endInstance(); + virtual void startSlice(const std::string&, int, bool); + virtual void endSlice(); + + virtual void writePendingObjects(); + + private: + + Int registerObject(const ValuePtr&); + + // Instance attributes + SliceType _sliceType; + + // Slice attributes + Container::size_type _writeSlice; // Position of the slice data members + + // Encapsulation attributes for object marshalling. + Int _objectIdIndex; + PtrToIndexMap _toBeMarshaledMap; + }; + + class ICE_API EncapsEncoder11 : public EncapsEncoder + { + public: + + EncapsEncoder11(OutputStream* stream, Encaps* encaps) : + EncapsEncoder(stream, encaps), _preAllocatedInstanceData(0), _current(0), _objectIdIndex(1) + { + } + + virtual void write(const ValuePtr&); + virtual void write(const UserException&); + + virtual void startInstance(SliceType, const SlicedDataPtr&); + virtual void endInstance(); + virtual void startSlice(const std::string&, int, bool); + virtual void endSlice(); + + virtual bool writeOpt(Int, OptionalFormat); + + private: + + void writeSlicedData(const SlicedDataPtr&); + void writeInstance(const ValuePtr&); + + struct InstanceData + { + InstanceData(InstanceData* p) : previous(p), next(0) + { + if(previous) + { + previous->next = this; + } + } + + ~InstanceData() + { + if(next) + { + delete next; + } + } + + // Instance attributes + SliceType sliceType; + bool firstSlice; + + // Slice attributes + Byte sliceFlags; + Container::size_type writeSlice; // Position of the slice data members + Container::size_type sliceFlagsPos; // Position of the slice flags + PtrToIndexMap indirectionMap; + ObjectList indirectionTable; + + InstanceData* previous; + InstanceData* next; + }; + InstanceData _preAllocatedInstanceData; + InstanceData* _current; + + Int _objectIdIndex; // The ID of the next object to marhsal + }; + + class Encaps : private ::IceUtil::noncopyable + { + + public: + + Encaps() : format(DefaultFormat), encoder(0), previous(0) + { + // Inlined for performance reasons. + } + ~Encaps() + { + // Inlined for performance reasons. + delete encoder; + } + void reset() + { + // Inlined for performance reasons. + delete encoder; + encoder = 0; + + previous = 0; + } + + Container::size_type start; + EncodingVersion encoding; + FormatType format; + + EncapsEncoder* encoder; + + Encaps* previous; + }; + + // + // The encoding version to use when there's no encapsulation to + // read from or write to. This is for example used to read message + // headers or when the user is using the streaming API with no + // encapsulation. + // + EncodingVersion _encoding; + + FormatType _format; + + Encaps* _currentEncaps; + + void initEncaps(); + + Encaps _preAllocatedEncaps; + + IceUtil::StringConverterPtr _stringConverter; + IceUtil::WstringConverterPtr _wstringConverter; +}; + +} // End namespace Ice + +#endif diff --git a/cpp/include/Ice/Protocol.h b/cpp/include/Ice/Protocol.h index 6cb5274f197..a3b56e701cf 100644 --- a/cpp/include/Ice/Protocol.h +++ b/cpp/include/Ice/Protocol.h @@ -72,9 +72,6 @@ enum ProtocolSupport EnableBoth }; -// Forward declaration -class BasicStream; - ICE_API void stringToMajorMinor(const ::std::string&, Ice::Byte&, Ice::Byte&); template<typename T> std::string @@ -104,6 +101,16 @@ ICE_API void throwUnsupportedProtocolException(const char*, int, const Ice::Prot ICE_API void throwUnsupportedEncodingException(const char*, int, const Ice::EncodingVersion&, const Ice::EncodingVersion&); +const ::Ice::Byte OPTIONAL_END_MARKER = 0xFF; + +const ::Ice::Byte FLAG_HAS_TYPE_ID_STRING = (1<<0); +const ::Ice::Byte FLAG_HAS_TYPE_ID_INDEX = (1<<1); +const ::Ice::Byte FLAG_HAS_TYPE_ID_COMPACT = (1<<0) | (1<<1); +const ::Ice::Byte FLAG_HAS_OPTIONAL_MEMBERS = (1<<2); +const ::Ice::Byte FLAG_HAS_INDIRECTION_TABLE = (1<<3); +const ::Ice::Byte FLAG_HAS_SLICE_SIZE = (1<<4); +const ::Ice::Byte FLAG_IS_LAST_SLICE = (1<<5); + } namespace Ice diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h index 07acb25e477..d9fce7f54df 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -26,7 +26,6 @@ //#include <Ice/RouterF.h> // Can't include RouterF.h here, otherwise we have cyclic includes //#include <Ice/LocatorF.h> // Can't include RouterF.h here, otherwise we have cyclic includes #include <Ice/Current.h> -#include <Ice/StreamF.h> #include <Ice/CommunicatorF.h> #include <Ice/ObserverHelper.h> #include <Ice/LocalException.h> @@ -66,10 +65,7 @@ class LocatorPrx; typedef ::std::shared_ptr<::Ice::LocatorPrx> LocatorPrxPtr; class LocalException; -} - -namespace Ice -{ +class OutputStream; class ICE_API ObjectPrx : public ::std::enable_shared_from_this<ObjectPrx> { @@ -500,6 +496,8 @@ public: int __hash() const; + void __write(OutputStream&) const; + protected: virtual ::std::shared_ptr<ObjectPrx> __newInstance() const; @@ -783,9 +781,7 @@ typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Locator> LocatorPrx; typedef LocatorPrx LocatorPrxPtr; class LocalException; - -ICE_API void ice_writeObjectPrx(const ::Ice::OutputStreamPtr&, const ObjectPrx&); -ICE_API void ice_readObjectPrx(const ::Ice::InputStreamPtr&, ObjectPrx&); +class OutputStream; class Callback_Object_ice_isA_Base : public virtual ::IceInternal::CallbackBase { }; typedef ::IceUtil::Handle< Callback_Object_ice_isA_Base> Callback_Object_ice_isAPtr; @@ -1225,6 +1221,8 @@ public: ::IceInternal::RequestHandlerPtr __setRequestHandler(const ::IceInternal::RequestHandlerPtr&); void __updateRequestHandler(const ::IceInternal::RequestHandlerPtr&, const ::IceInternal::RequestHandlerPtr&); + void __write(::Ice::OutputStream&) const; + protected: virtual Object* __newInstance() const; diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h index 83ef02bce94..4d2a444e1f9 100644 --- a/cpp/include/Ice/SlicedData.h +++ b/cpp/include/Ice/SlicedData.h @@ -96,8 +96,8 @@ public: virtual void __gcVisitMembers(IceInternal::GCVisitor&); #endif - virtual void __write(::IceInternal::BasicStream*) const; - virtual void __read(::IceInternal::BasicStream*); + virtual void __write(::Ice::OutputStream*) const; + virtual void __read(::Ice::InputStream*); private: diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h deleted file mode 100644 index aa500040445..00000000000 --- a/cpp/include/Ice/Stream.h +++ /dev/null @@ -1,485 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef ICE_STREAM_H -#define ICE_STREAM_H - -#include <Ice/StreamF.h> -#include <Ice/CommunicatorF.h> -#include <Ice/Object.h> -#include <Ice/Exception.h> -#include <Ice/Proxy.h> -#include <Ice/SlicedDataF.h> -#include <IceUtil/Shared.h> -#include <Ice/StreamHelpers.h> - -namespace Ice -{ - -class ICE_API ReadObjectCallback : public ::IceUtil::Shared -{ -public: - - virtual void invoke(const ValuePtr&) = 0; -}; -typedef IceUtil::Handle<ReadObjectCallback> ReadObjectCallbackPtr; - -template<typename T> -class ReadObjectCallbackI : public ReadObjectCallback -{ - -public: - - ReadObjectCallbackI(ICE_INTERNAL_HANDLE<T>& v) : - _v(v) - { - } - - virtual void invoke(const ValuePtr& p) - { -#ifdef ICE_CPP11_MAPPING - _v = ::std::dynamic_pointer_cast<T>(p); -#else - _v = ::IceInternal::Handle<T>::dynamicCast(p); -#endif - if(p && !_v) - { - IceInternal::Ex::throwUOE(T::ice_staticId(), p); - } - } - -private: - - ICE_INTERNAL_HANDLE<T>& _v; -}; - -class ICE_API UserExceptionReader : public UserException -{ -public: - - UserExceptionReader(const CommunicatorPtr&); - ~UserExceptionReader() throw(); - - virtual void read(const InputStreamPtr&) const = 0; - virtual bool usesClasses() const = 0; - - virtual ::std::string ice_id() const = 0; -#ifndef ICE_CPP11_MAPPING - ICE_DEPRECATED_API("ice_name() is deprecated, use ice_id() instead.") - virtual ::std::string ice_name() const = 0; -#endif - virtual UserException* ice_clone() const = 0; - virtual void ice_throw() const = 0; - - virtual void __write(IceInternal::BasicStream*) const; - virtual void __read(IceInternal::BasicStream*); - - virtual bool __usesClasses() const; - - using UserException::__read; - using UserException::__write; - -protected: - - virtual void __writeImpl(::IceInternal::BasicStream*) const; - virtual void __readImpl(::IceInternal::BasicStream*); - - using UserException::__writeImpl; - using UserException::__readImpl; - - const CommunicatorPtr _communicator; -}; - -class ICE_API UserExceptionReaderFactory : public IceUtil::Shared -{ -public: - - virtual void createAndThrow(const std::string&) const = 0; -}; -typedef ::IceUtil::Handle<UserExceptionReaderFactory> UserExceptionReaderFactoryPtr; - -class ICE_API InputStream : public ::IceUtil::Shared -{ -public: - - typedef size_t size_type; - - virtual CommunicatorPtr communicator() const = 0; - - virtual void sliceObjects(bool) = 0; - - virtual Int readSize() = 0; - virtual Int readAndCheckSeqSize(int) = 0; - - virtual ObjectPrxPtr readProxy() = 0; -#ifndef ICE_CPP11_MAPPING - template<typename T> void read(IceInternal::ProxyHandle<T>& v) -#else - template<typename T, typename ::std::enable_if<IsProxy<T>::value>::type* = nullptr> - void read(::std::shared_ptr<T>& v) -#endif - { - ObjectPrxPtr proxy = readProxy(); - if(!proxy) - { - v = 0; - } - else - { - v = ICE_MAKE_SHARED(T); - v->__copyFrom(proxy); - } - } - - virtual void readObject(const ReadObjectCallbackPtr&) = 0; -#ifndef ICE_CPP11_MAPPING - template<typename T> void read(IceInternal::Handle<T>& v) -#else - template<typename T, typename ::std::enable_if<IsValue<T>::value>::type* = nullptr> - void read(::std::shared_ptr<T>& v) -#endif - { - readObject(new ReadObjectCallbackI<T>(v)); - } - - virtual Int readEnum(Int maxValue) - { - if(getEncoding() == Encoding_1_0) - { - if(maxValue < 127) - { - Byte value; - read(value); - return value; - } - else if(maxValue < 32767) - { - Short value; - read(value); - return value; - } - else - { - Int value; - read(value); - return value; - } - } - else - { - return readSize(); - } - } - - virtual void throwException() = 0; - virtual void throwException(const UserExceptionReaderFactoryPtr&) = 0; - - virtual void startObject() = 0; - virtual SlicedDataPtr endObject(bool) = 0; - - virtual void startException() = 0; - virtual SlicedDataPtr endException(bool) = 0; - - virtual std::string startSlice() = 0; - virtual void endSlice() = 0; - virtual void skipSlice() = 0; - - virtual EncodingVersion startEncapsulation() = 0; - virtual void endEncapsulation() = 0; - virtual EncodingVersion skipEncapsulation() = 0; - - virtual EncodingVersion getEncoding() const = 0; - - virtual void readPendingObjects() = 0; - - virtual size_type pos() = 0; - virtual void rewind() = 0; - - virtual void skip(Int) = 0; - virtual void skipSize() = 0; - - virtual void read(bool&) = 0; - virtual void read(Byte&) = 0; - virtual void read(Short&) = 0; - virtual void read(Int&) = 0; - virtual void read(Long&) = 0; - virtual void read(Float&) = 0; - virtual void read(Double&) = 0; - virtual void read(::std::string&, bool = true) = 0; - virtual void read(const char*&, size_t&) = 0; - virtual void read(const char*&, size_t&, std::string&) = 0; - virtual void read(::std::vector< ::std::string>&, bool) = 0; // Overload required for additional bool argument. - virtual void read(::std::wstring&) = 0; - - // - // std::vector<bool> is a special C++ type, so we give it its own read function - // - virtual void read(::std::vector<bool>&) = 0; - - virtual void read(::std::pair<const bool*, const bool*>&, ::IceUtil::ScopedArray<bool>&) = 0; - virtual void read(::std::pair<const Byte*, const Byte*>&) = 0; - virtual void read(::std::pair<const Short*, const Short*>&, ::IceUtil::ScopedArray<Short>&) = 0; - virtual void read(::std::pair<const Int*, const Int*>&, ::IceUtil::ScopedArray<Int>&) = 0; - virtual void read(::std::pair<const Long*, const Long*>&, ::IceUtil::ScopedArray<Long>&) = 0; - virtual void read(::std::pair<const Float*, const Float*>&, ::IceUtil::ScopedArray<Float>&) = 0; - virtual void read(::std::pair<const Double*, const Double*>&, ::IceUtil::ScopedArray<Double>&) = 0; - - // This method is useful for generic stream helpers - void read(::std::pair<const Byte*, const Byte*>& p, ::IceUtil::ScopedArray<Byte>& result) - { - result.reset(); - read(p); - } - - virtual bool readOptional(Int, OptionalFormat) = 0; - - template<typename T> inline void read(T& v) - { - StreamHelper<T, StreamableTraits<T>::helper>::read(this, v); - } - - template<typename T> inline void read(Int tag, IceUtil::Optional<T>& v) - { - if(readOptional(tag, StreamOptionalHelper<T, - StreamableTraits<T>::helper, - StreamableTraits<T>::fixedLength>::optionalFormat)) - { - v.__setIsSet(); - StreamOptionalHelper<T, StreamableTraits<T>::helper, StreamableTraits<T>::fixedLength>::read(this, *v); - } - else - { - v = IceUtil::None; - } - } - - virtual void closure(void*) = 0; - virtual void* closure() const = 0; -}; - -class ICE_API OutputStream : public ::IceUtil::Shared -{ -public: - - typedef size_t size_type; - - virtual CommunicatorPtr communicator() const = 0; - - virtual void writeSize(Int) = 0; - - virtual void writeProxy(const ObjectPrxPtr&) = 0; -#ifndef ICE_CPP11_MAPPING - template<typename T> void write(const IceInternal::ProxyHandle<T>& v) - { - writeProxy(ObjectPrx(v.get())); - } -#else - template<typename T, typename ::std::enable_if<IsProxy<T>::value>::type* = nullptr> - void write(const ::std::shared_ptr<T>& v) - { - writeProxy(::std::dynamic_pointer_cast<ObjectPrx>(v)); - } -#endif - - virtual void writeObject(const ValuePtr&) = 0; -#ifndef ICE_CPP11_MAPPING - template<typename T> void write(const IceInternal::Handle<T>& v) - { - writeObject(ObjectPtr(v.get())); - } -#else - template<typename T, typename ::std::enable_if<IsValue<T>::value>::type* = nullptr> - void write(const ::std::shared_ptr<T>& v) - { - writeObject(::std::dynamic_pointer_cast<Value>(v)); - } -#endif - - virtual void writeEnum(Int v, Int maxValue) - { - if(getEncoding() == Encoding_1_0) - { - if(maxValue < 127) - { - write(static_cast<Byte>(v)); - } - else if(maxValue < 32767) - { - write(static_cast<Short>(v)); - } - else - { - write(v); - } - } - else - { - writeSize(v); - } - } - - virtual void writeException(const UserException&) = 0; - - virtual void startObject(const SlicedDataPtr&) = 0; - virtual void endObject() = 0; - - virtual void startException(const SlicedDataPtr&) = 0; - virtual void endException() = 0; - - virtual void startSlice(const ::std::string&, int, bool) = 0; - virtual void endSlice() = 0; - - virtual void startEncapsulation(const EncodingVersion&, FormatType) = 0; - virtual void startEncapsulation() = 0; - virtual void endEncapsulation() = 0; - - virtual EncodingVersion getEncoding() const = 0; - - virtual void writePendingObjects() = 0; - - virtual void finished(::std::vector<Byte>&) = 0; - virtual std::pair<const Byte*, const Byte*> finished() = 0; - - virtual size_type pos() = 0; - virtual void rewrite(Int, size_type) = 0; - - virtual void reset(bool) = 0; - - virtual void write(bool) = 0; - virtual void write(Byte) = 0; - virtual void write(Short) = 0; - virtual void write(Int) = 0; - virtual void write(Long) = 0; - virtual void write(Float) = 0; - virtual void write(Double) = 0; - virtual void write(const ::std::string&, bool = true) = 0; - virtual void write(const char*, size_t, bool = true) = 0; - virtual void write(const ::std::vector< ::std::string>&, bool) = 0; // Overload required for bool argument. - virtual void write(const char*, bool = true) = 0; - virtual void write(const ::std::wstring&) = 0; - - // - // std::vector<bool> is a special C++ type, so we give it its own write function - // - virtual void write(const ::std::vector<bool>&) = 0; - - virtual void write(const bool*, const bool*) = 0; - virtual void write(const Byte*, const Byte*) = 0; - virtual void write(const Short*, const Short*) = 0; - virtual void write(const Int*, const Int*) = 0; - virtual void write(const Long*, const Long*) = 0; - virtual void write(const Float*, const Float*) = 0; - virtual void write(const Double*, const Double*) = 0; - - virtual bool writeOptional(Int, OptionalFormat) = 0; - - virtual size_type startSize() = 0; - virtual void endSize(size_type pos) = 0; - - template<typename T> inline void write(const T& v) - { - StreamHelper<T, StreamableTraits<T>::helper>::write(this, v); - } - - template<typename T> inline void write(Int tag, const IceUtil::Optional<T>& v) - { - if(v) - { - writeOptional(tag, StreamOptionalHelper<T, - StreamableTraits<T>::helper, - StreamableTraits<T>::fixedLength>::optionalFormat); - StreamOptionalHelper<T, StreamableTraits<T>::helper, StreamableTraits<T>::fixedLength>::write(this, *v); - } - } - - // - // Template functions for sequences and custom sequences - // - template<typename T> void write(const T* begin, const T* end) - { - writeSize(static_cast<Int>(end - begin)); - for(const T* p = begin; p != end; ++p) - { - write(*p); - } - } -}; - -class ICE_API ObjectReader : public Object -{ -public: - - virtual void read(const InputStreamPtr&) = 0; - -private: - - virtual void __write(::IceInternal::BasicStream*) const; - virtual void __read(::IceInternal::BasicStream*); - - virtual void __write(const OutputStreamPtr&) const; - virtual void __read(const InputStreamPtr&); -}; -typedef ::IceInternal::Handle<ObjectReader> ObjectReaderPtr; - -class ICE_API ObjectWriter : public Object -{ -public: - - virtual void write(const OutputStreamPtr&) const = 0; - -private: - - virtual void __write(::IceInternal::BasicStream*) const; - virtual void __read(::IceInternal::BasicStream*); - - virtual void __write(const OutputStreamPtr&) const; - virtual void __read(const InputStreamPtr&); -}; -typedef ::IceInternal::Handle<ObjectWriter> ObjectWriterPtr; - -class ICE_API UserExceptionWriter : public UserException -{ -public: - - UserExceptionWriter(const CommunicatorPtr&); - ~UserExceptionWriter() throw(); - - virtual void write(const OutputStreamPtr&) const = 0; - virtual bool usesClasses() const = 0; - - virtual ::std::string ice_id() const = 0; -#ifndef ICE_CPP11_MAPPING - ICE_DEPRECATED_API("ice_name() is deprecated, use ice_id() instead.") - virtual ::std::string ice_name() const = 0; -#endif - virtual UserException* ice_clone() const = 0; - virtual void ice_throw() const = 0; - - virtual void __write(IceInternal::BasicStream*) const; - virtual void __read(IceInternal::BasicStream*); - - virtual bool __usesClasses() const; - - using UserException::__read; - using UserException::__write; - -protected: - - virtual void __writeImpl(::IceInternal::BasicStream*) const; - virtual void __readImpl(::IceInternal::BasicStream*); - - using UserException::__writeImpl; - using UserException::__readImpl; - - const CommunicatorPtr _communicator; -}; - -} - -#endif diff --git a/cpp/include/Ice/StreamF.h b/cpp/include/Ice/StreamF.h deleted file mode 100644 index f7f17eb27e2..00000000000 --- a/cpp/include/Ice/StreamF.h +++ /dev/null @@ -1,30 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef ICE_STREAM_F_H -#define ICE_STREAM_F_H - -#include <IceUtil/Shared.h> - -#include <Ice/Handle.h> - -namespace Ice -{ - -class InputStream; -ICE_API IceUtil::Shared* upCast(::Ice::InputStream*); -typedef IceInternal::Handle< InputStream > InputStreamPtr; - -class OutputStream; -ICE_API IceUtil::Shared* upCast(::Ice::OutputStream*); -typedef IceInternal::Handle< OutputStream > OutputStreamPtr; - -} - -#endif diff --git a/cpp/include/Ice/UserExceptionFactory.h b/cpp/include/Ice/UserExceptionFactory.h index 4a1085fd15d..23c8aba5999 100644 --- a/cpp/include/Ice/UserExceptionFactory.h +++ b/cpp/include/Ice/UserExceptionFactory.h @@ -14,7 +14,7 @@ #include <IceUtil/Handle.h> #include <Ice/Config.h> -namespace IceInternal +namespace Ice { class ICE_API UserExceptionFactory : public IceUtil::Shared @@ -24,11 +24,15 @@ public: virtual void createAndThrow(const ::std::string&) = 0; virtual ~UserExceptionFactory() {} }; - typedef ::IceUtil::Handle<UserExceptionFactory> UserExceptionFactoryPtr; +} + +namespace IceInternal +{ + template<class E> -class DefaultUserExceptionFactory : public UserExceptionFactory +class DefaultUserExceptionFactory : public Ice::UserExceptionFactory { public: diff --git a/cpp/include/Ice/Value.h b/cpp/include/Ice/Value.h index 3a242168229..d348b0e01e5 100644 --- a/cpp/include/Ice/Value.h +++ b/cpp/include/Ice/Value.h @@ -13,18 +13,13 @@ #ifdef ICE_CPP11_MAPPING // C++11 mapping #include <Ice/ValueF.h> -#include <Ice/StreamF.h> - -namespace IceInternal -{ - -class BasicStream; - -} namespace Ice { +class OutputStream; +class InputStream; + class ICE_API Value { public: @@ -34,8 +29,8 @@ public: virtual void ice_preMarshal(); virtual void ice_postUnmarshal(); - virtual void __write(IceInternal::BasicStream*) const; - virtual void __read(IceInternal::BasicStream*); + virtual void __write(Ice::OutputStream*) const; + virtual void __read(Ice::InputStream*); virtual const std::string& ice_id() const; static const std::string& ice_staticId(); @@ -46,8 +41,8 @@ protected: virtual std::shared_ptr<Value> cloneImpl() const = 0; - virtual void __writeImpl(IceInternal::BasicStream*) const {} - virtual void __readImpl(IceInternal::BasicStream*) {} + virtual void __writeImpl(Ice::OutputStream*) const {} + virtual void __readImpl(Ice::InputStream*) {} }; template<typename T, typename Base> class ValueHelper : public Base @@ -76,9 +71,6 @@ protected: } }; -ICE_API void ice_writeObject(const OutputStreamPtr&, const std::shared_ptr<Value>&); -ICE_API void ice_readObject(const InputStreamPtr&, std::shared_ptr<Value>&); - } #endif // C++11 mapping end diff --git a/cpp/include/Ice/ValueFactoryManagerF.h b/cpp/include/Ice/ValueFactoryManagerF.h deleted file mode 100644 index 0cbd46da420..00000000000 --- a/cpp/include/Ice/ValueFactoryManagerF.h +++ /dev/null @@ -1,26 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef ICE_VALUE_FACTORY_MANAGER_F_H -#define ICE_VALUE_FACTORY_MANAGER_F_H - -#include <IceUtil/Shared.h> - -#include <Ice/Handle.h> - -namespace IceInternal -{ - -class ValueFactoryManager; -IceUtil::Shared* upCast(ValueFactoryManager*); -typedef Handle<ValueFactoryManager> ValueFactoryManagerPtr; - -} - -#endif diff --git a/cpp/src/Glacier2/.depend.mak b/cpp/src/Glacier2/.depend.mak index d7d092331b4..043a3219cbe 100755 --- a/cpp/src/Glacier2/.depend.mak +++ b/cpp/src/Glacier2/.depend.mak @@ -39,7 +39,6 @@ Blobject.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -69,12 +68,12 @@ Blobject.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -83,7 +82,6 @@ Blobject.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -95,6 +93,7 @@ Blobject.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -123,7 +122,6 @@ Blobject.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -178,7 +176,6 @@ ClientBlobject.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -208,12 +205,12 @@ ClientBlobject.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -222,7 +219,6 @@ ClientBlobject.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -234,6 +230,7 @@ ClientBlobject.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -262,7 +259,6 @@ ClientBlobject.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -306,7 +302,6 @@ FilterI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -343,12 +338,12 @@ FilterI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -363,13 +358,13 @@ FilterI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -399,7 +394,6 @@ FilterManager.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -436,12 +430,12 @@ FilterManager.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -456,11 +450,11 @@ FilterManager.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -503,7 +497,6 @@ FilterManager.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -560,7 +553,6 @@ Glacier2Router.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -590,12 +582,12 @@ Glacier2Router.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -604,7 +596,6 @@ Glacier2Router.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -616,6 +607,7 @@ Glacier2Router.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -644,7 +636,6 @@ Glacier2Router.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -702,7 +693,6 @@ Instance.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -732,12 +722,12 @@ Instance.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -746,7 +736,6 @@ Instance.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -758,6 +747,7 @@ Instance.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -786,7 +776,6 @@ Instance.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -837,7 +826,6 @@ InstrumentationI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -875,12 +863,12 @@ InstrumentationI.obj: \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -895,6 +883,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -907,7 +896,6 @@ InstrumentationI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -957,7 +945,6 @@ ProxyVerifier.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -987,12 +974,12 @@ ProxyVerifier.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1001,7 +988,6 @@ ProxyVerifier.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1013,6 +999,7 @@ ProxyVerifier.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1041,7 +1028,6 @@ ProxyVerifier.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1084,7 +1070,6 @@ RequestQueue.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1114,12 +1099,12 @@ RequestQueue.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1128,7 +1113,6 @@ RequestQueue.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1140,6 +1124,7 @@ RequestQueue.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1168,7 +1153,6 @@ RequestQueue.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1211,7 +1195,6 @@ RouterI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1248,12 +1231,12 @@ RouterI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1268,7 +1251,6 @@ RouterI.obj: \ "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1280,6 +1262,7 @@ RouterI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1308,7 +1291,6 @@ RouterI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1366,7 +1348,6 @@ RoutingTable.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1396,12 +1377,12 @@ RoutingTable.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1410,7 +1391,6 @@ RoutingTable.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1422,6 +1402,7 @@ RoutingTable.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1450,7 +1431,6 @@ RoutingTable.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1496,7 +1476,6 @@ ServerBlobject.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1526,12 +1505,12 @@ ServerBlobject.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1540,7 +1519,6 @@ ServerBlobject.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1552,6 +1530,7 @@ ServerBlobject.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1580,7 +1559,6 @@ ServerBlobject.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1634,7 +1612,6 @@ SessionRouterI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1664,12 +1641,12 @@ SessionRouterI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1678,7 +1655,6 @@ SessionRouterI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1690,6 +1666,7 @@ SessionRouterI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1718,7 +1695,6 @@ SessionRouterI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1770,7 +1746,6 @@ Instrumentation.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1787,8 +1762,9 @@ Instrumentation.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -1797,10 +1773,11 @@ Instrumentation.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak index c1e1e0f1989..9b4d56e5c5c 100755 --- a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak +++ b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak @@ -16,7 +16,6 @@ CryptPermissionsVerifierI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -53,12 +52,12 @@ CryptPermissionsVerifierI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -73,6 +72,7 @@ CryptPermissionsVerifierI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -89,7 +89,6 @@ CryptPermissionsVerifierI.obj: \ "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -119,7 +118,6 @@ CryptPermissionsVerifierI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/src/Glacier2Lib/.depend.mak b/cpp/src/Glacier2Lib/.depend.mak index bc4df05fe05..1010e49158a 100755 --- a/cpp/src/Glacier2Lib/.depend.mak +++ b/cpp/src/Glacier2Lib/.depend.mak @@ -65,7 +65,6 @@ Application.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -95,12 +94,12 @@ Application.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -109,7 +108,6 @@ Application.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -121,6 +119,7 @@ Application.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -148,7 +147,6 @@ Application.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -188,7 +186,6 @@ NullPermissionsVerifier.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -225,12 +222,12 @@ NullPermissionsVerifier.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -245,6 +242,7 @@ NullPermissionsVerifier.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -257,7 +255,6 @@ NullPermissionsVerifier.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -288,7 +285,6 @@ NullPermissionsVerifier.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -329,7 +325,6 @@ SessionHelper.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -359,12 +354,12 @@ SessionHelper.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -373,7 +368,6 @@ SessionHelper.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -385,6 +379,7 @@ SessionHelper.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -415,7 +410,6 @@ SessionHelper.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -455,7 +449,6 @@ Metrics.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -492,12 +485,12 @@ Metrics.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -512,6 +505,7 @@ Metrics.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -540,7 +534,6 @@ PermissionsVerifierF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -577,12 +570,12 @@ PermissionsVerifierF.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -591,6 +584,7 @@ PermissionsVerifierF.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\OutputStream.h" \ PermissionsVerifier.obj: \ PermissionsVerifier.cpp \ @@ -609,7 +603,6 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -646,12 +639,12 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -666,6 +659,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -695,7 +689,6 @@ Router.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -732,12 +725,12 @@ Router.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -752,6 +745,7 @@ Router.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -785,7 +779,6 @@ RouterF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -822,12 +815,12 @@ RouterF.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -836,6 +829,7 @@ RouterF.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\OutputStream.h" \ Session.obj: \ Session.cpp \ @@ -854,7 +848,6 @@ Session.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -891,12 +884,12 @@ Session.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -911,6 +904,7 @@ Session.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -940,7 +934,6 @@ SSLInfo.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -952,8 +945,9 @@ SSLInfo.obj: \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Glacier2\Config.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -967,10 +961,11 @@ SSLInfo.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak index a556d26d1df..8283090951b 100755 --- a/cpp/src/Ice/.depend.mak +++ b/cpp/src/Ice/.depend.mak @@ -210,7 +210,6 @@ Acceptor.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -247,12 +246,12 @@ Acceptor.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -261,7 +260,6 @@ Acceptor.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ ACM.obj: \ @@ -292,7 +290,6 @@ ACM.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -322,12 +319,12 @@ ACM.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -338,7 +335,6 @@ ACM.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ConnectionI.h" \ "..\..\src\IceUtil\StopWatch.h" \ "$(includedir)\Ice\ConnectionFactoryF.h" \ @@ -360,6 +356,7 @@ ACM.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -380,6 +377,7 @@ ACM.obj: \ "RouterInfoF.h" \ "LocatorInfoF.h" \ "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -423,7 +421,6 @@ Application.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -453,12 +450,12 @@ Application.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -467,7 +464,6 @@ Application.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -479,6 +475,7 @@ Application.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -506,7 +503,6 @@ Application.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -552,7 +548,6 @@ AsyncResult.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -571,12 +566,12 @@ AsyncResult.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -587,7 +582,6 @@ AsyncResult.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\ThreadPoolF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ @@ -619,6 +613,7 @@ AsyncResult.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -638,6 +633,7 @@ AsyncResult.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -656,133 +652,6 @@ Base64.obj: \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ -BasicStream.obj: \ - BasicStream.cpp \ - "$(includedir)\IceUtil\DisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\Ice\Traits.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "DefaultsAndOverrides.h" \ - "DefaultsAndOverridesF.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "Network.h" \ - "NetworkF.h" \ - "NetworkProxyF.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "ProtocolInstanceF.h" \ - "Instance.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "TraceLevelsF.h" \ - "RouterInfoF.h" \ - "LocatorInfoF.h" \ - "ReferenceFactoryF.h" \ - "$(includedir)\Ice\ThreadPoolF.h" \ - "$(includedir)\Ice\ConnectionFactoryF.h" \ - "ACM.h" \ - "$(includedir)\Ice\ACMF.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ - "EndpointFactoryManagerF.h" \ - "IPEndpointIF.h" \ - "RetryQueueF.h" \ - "$(includedir)\Ice\DynamicLibraryF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "ImplicitContextI.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Value.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultValueFactory.h" \ - "ProxyFactory.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "ValueFactoryManager.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "TraceUtil.h" \ - "TraceLevels.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\SlicedData.h" \ - BatchRequestQueue.obj: \ BatchRequestQueue.cpp \ "BatchRequestQueue.h" \ @@ -807,17 +676,14 @@ BatchRequestQueue.obj: \ "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\Handle.h" \ "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -825,24 +691,22 @@ BatchRequestQueue.obj: \ "$(includedir)\IceUtil\Iterator.h" \ "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "TraceLevelsF.h" \ "DefaultsAndOverridesF.h" \ @@ -865,11 +729,16 @@ BatchRequestQueue.obj: \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -916,7 +785,6 @@ Buffer.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -965,7 +833,6 @@ CollocatedRequestHandler.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -978,21 +845,18 @@ CollocatedRequestHandler.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "ObjectAdapterI.h" \ @@ -1004,10 +868,13 @@ CollocatedRequestHandler.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -1053,6 +920,7 @@ CollocatedRequestHandler.obj: \ "Instance.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "DefaultsAndOverridesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ "RetryQueueF.h" \ @@ -1099,7 +967,6 @@ CommunicatorI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1129,12 +996,12 @@ CommunicatorI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1143,7 +1010,6 @@ CommunicatorI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1155,6 +1021,7 @@ CommunicatorI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1211,7 +1078,6 @@ CommunicatorI.obj: \ "BatchRequestQueue.h" \ "SharedContext.h" \ "ProxyFactory.h" \ - "ValueFactoryManager.h" \ "ObjectAdapterFactory.h" \ "ObjectAdapterI.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ @@ -1248,7 +1114,6 @@ ConnectionFactory.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1283,12 +1148,12 @@ ConnectionFactory.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1302,7 +1167,6 @@ ConnectionFactory.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "EventHandler.h" \ @@ -1320,6 +1184,7 @@ ConnectionFactory.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "AcceptorF.h" \ "RouterInfoF.h" \ "EndpointI.h" \ @@ -1330,6 +1195,7 @@ ConnectionFactory.obj: \ "DefaultsAndOverridesF.h" \ "LocatorInfoF.h" \ "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -1407,7 +1273,6 @@ ConnectionI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1436,12 +1301,12 @@ ConnectionI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1456,7 +1321,6 @@ ConnectionI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "EventHandler.h" \ @@ -1474,6 +1338,7 @@ ConnectionI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\Ice\InstrumentationF.h" \ @@ -1481,6 +1346,7 @@ ConnectionI.obj: \ "RouterInfoF.h" \ "LocatorInfoF.h" \ "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -1561,7 +1427,6 @@ ConnectionRequestHandler.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -1584,12 +1449,12 @@ ConnectionRequestHandler.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1606,6 +1471,7 @@ ConnectionRequestHandler.obj: \ "LocatorInfoF.h" \ "BatchRequestQueue.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "$(includedir)\Ice\OutputStream.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1628,7 +1494,6 @@ ConnectionRequestHandler.obj: \ "$(includedir)\Ice\ConnectionFactoryF.h" \ "TransceiverF.h" \ "ConnectorF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "EventHandler.h" \ "EventHandlerF.h" \ @@ -1700,7 +1565,6 @@ ConnectRequestHandler.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -1723,12 +1587,12 @@ ConnectRequestHandler.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1742,6 +1606,7 @@ ConnectRequestHandler.obj: \ "LocatorInfoF.h" \ "BatchRequestQueue.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "$(includedir)\Ice\OutputStream.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1774,7 +1639,7 @@ ConnectRequestHandler.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -1825,7 +1690,6 @@ DefaultsAndOverrides.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1862,12 +1726,12 @@ DefaultsAndOverrides.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1880,7 +1744,6 @@ DefaultsAndOverrides.obj: \ "Network.h" \ "NetworkF.h" \ "NetworkProxyF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1889,6 +1752,7 @@ DefaultsAndOverrides.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1923,7 +1787,6 @@ DispatchInterceptor.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1943,13 +1806,15 @@ DispatchInterceptor.obj: \ "$(includedir)\Ice\ConnectionIF.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\ObserverHelper.h" \ @@ -1994,7 +1859,6 @@ EndpointFactory.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2049,11 +1913,10 @@ EndpointFactory.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2063,6 +1926,7 @@ EndpointFactory.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -2084,6 +1948,7 @@ EndpointFactory.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -2116,7 +1981,6 @@ EndpointFactoryManager.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2141,7 +2005,7 @@ EndpointFactoryManager.obj: \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ @@ -2149,11 +2013,11 @@ EndpointFactoryManager.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -2186,6 +2050,7 @@ EndpointFactoryManager.obj: \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "IPEndpointIF.h" \ "RetryQueueF.h" \ @@ -2235,7 +2100,6 @@ EndpointI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2267,54 +2131,38 @@ EventHandler.obj: \ "$(includedir)\Ice\Config.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\ThreadPoolF.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ObjectF.h" \ + "Network.h" \ + "NetworkF.h" \ + "NetworkProxyF.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ "$(includedir)\Ice\Traits.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "Network.h" \ - "NetworkF.h" \ - "NetworkProxyF.h" \ - "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Proxy.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\ConnectionIF.h" \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\EndpointF.h" \ + "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\IceUtil\UndefSysMacros.h" \ + "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ @@ -2322,13 +2170,27 @@ EventHandler.obj: \ "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -2345,6 +2207,7 @@ EventHandler.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -2365,6 +2228,7 @@ EventHandler.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -2382,7 +2246,6 @@ Exception.obj: \ "$(includedir)\IceUtil\Shared.h" \ "$(includedir)\IceUtil\Atomic.h" \ "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -2428,26 +2291,25 @@ Exception.obj: \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ - "$(includedir)\Ice\Stream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringUtil.h" \ FactoryTable.obj: \ @@ -2474,7 +2336,6 @@ FactoryTable.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2510,7 +2371,6 @@ FactoryTableInit.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2548,7 +2408,6 @@ GCObject.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2573,26 +2432,15 @@ HttpParser.obj: \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\Handle.h" \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2600,20 +2448,10 @@ HttpParser.obj: \ "$(includedir)\IceUtil\Iterator.h" \ "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\Identity.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceUtil\StringUtil.h" \ @@ -2635,7 +2473,6 @@ ImplicitContextI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2652,8 +2489,9 @@ ImplicitContextI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -2662,13 +2500,9 @@ ImplicitContextI.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ Incoming.obj: \ @@ -2693,7 +2527,6 @@ Incoming.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -2702,8 +2535,9 @@ Incoming.obj: \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -2716,11 +2550,12 @@ Incoming.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\ObserverHelper.h" \ @@ -2740,7 +2575,6 @@ Incoming.obj: \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -2759,7 +2593,6 @@ Incoming.obj: \ "TransceiverF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "EventHandler.h" \ @@ -2783,6 +2616,7 @@ Incoming.obj: \ "RouterInfoF.h" \ "LocatorInfoF.h" \ "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -2831,7 +2665,6 @@ IncomingAsync.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -2840,8 +2673,9 @@ IncomingAsync.obj: \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -2853,11 +2687,12 @@ IncomingAsync.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\ObserverHelper.h" \ @@ -2872,7 +2707,6 @@ IncomingAsync.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ @@ -2890,7 +2724,6 @@ IncomingAsync.obj: \ "TransceiverF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "EventHandler.h" \ @@ -2914,6 +2747,7 @@ IncomingAsync.obj: \ "RouterInfoF.h" \ "LocatorInfoF.h" \ "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -2968,7 +2802,6 @@ Initialize.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2998,12 +2831,12 @@ Initialize.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3012,7 +2845,6 @@ Initialize.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -3024,6 +2856,7 @@ Initialize.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -3038,8 +2871,6 @@ Initialize.obj: \ "$(includedir)\Ice\FacetMap.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "PropertiesI.h" \ - "StreamI.h" \ - "$(includedir)\Ice\Stream.h" \ "LoggerI.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\IceUtil\FileUtil.h" \ @@ -3066,6 +2897,131 @@ Initialize.obj: \ "$(includedir)\Ice\Process.h" \ "PluginManagerI.h" \ +InputStream.obj: \ + InputStream.cpp \ + "$(includedir)\IceUtil\DisableWarnings.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Atomic.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\ValueF.h" \ + "$(includedir)\Ice\Exception.h" \ + "$(includedir)\Ice\Format.h" \ + "$(includedir)\Ice\LocalObject.h" \ + "$(includedir)\Ice\LocalObjectF.h" \ + "$(includedir)\Ice\StreamHelpers.h" \ + "$(includedir)\IceUtil\ScopedArray.h" \ + "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ + "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\IceUtil\UndefSysMacros.h" \ + "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\InstanceF.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "DefaultsAndOverrides.h" \ + "DefaultsAndOverridesF.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\Proxy.h" \ + "$(includedir)\Ice\ProxyFactoryF.h" \ + "$(includedir)\Ice\ConnectionIF.h" \ + "$(includedir)\Ice\RequestHandlerF.h" \ + "$(includedir)\Ice\EndpointF.h" \ + "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\VirtualShared.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\Endpoint.h" \ + "Network.h" \ + "NetworkF.h" \ + "NetworkProxyF.h" \ + "ProtocolInstanceF.h" \ + "Instance.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\Ice\InstrumentationF.h" \ + "TraceLevelsF.h" \ + "RouterInfoF.h" \ + "LocatorInfoF.h" \ + "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ThreadPoolF.h" \ + "$(includedir)\Ice\ConnectionFactoryF.h" \ + "ACM.h" \ + "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ + "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ + "EndpointFactoryManagerF.h" \ + "IPEndpointIF.h" \ + "RetryQueueF.h" \ + "$(includedir)\Ice\DynamicLibraryF.h" \ + "$(includedir)\Ice\PluginF.h" \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "ImplicitContextI.h" \ + "$(includedir)\Ice\ImplicitContext.h" \ + "$(includedir)\Ice\FacetMap.h" \ + "$(includedir)\Ice\Process.h" \ + "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ + "$(includedir)\Ice\Incoming.h" \ + "$(includedir)\Ice\ServantLocatorF.h" \ + "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ + "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ + "ProxyFactory.h" \ + "$(includedir)\Ice\OutgoingAsyncF.h" \ + "$(includedir)\Ice\Properties.h" \ + "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\PropertiesAdmin.h" \ + "TraceUtil.h" \ + "TraceLevels.h" \ + "$(includedir)\Ice\LoggerUtil.h" \ + "$(includedir)\Ice\Logger.h" \ + "$(includedir)\Ice\SlicedData.h" \ + Instance.obj: \ Instance.cpp \ "Instance.h" \ @@ -3096,7 +3052,6 @@ Instance.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3135,11 +3090,11 @@ Instance.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3150,7 +3105,7 @@ Instance.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -3173,6 +3128,7 @@ Instance.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -3212,8 +3168,7 @@ Instance.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "AcceptorF.h" \ "EndpointI.h" \ - "ValueFactoryManager.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ + "ValueFactoryManagerI.h" \ "ObjectAdapterFactory.h" \ "ObjectAdapterI.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ @@ -3245,6 +3200,9 @@ Instance.obj: \ "$(includedir)\Ice\MetricsFunctional.h" \ "LoggerAdminI.h" \ "RegisterPluginsInit.h" \ + "$(includedir)\Ice\Functional.h" \ + "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\DisableWarnings.h" \ "$(includedir)\IceUtil\UUID.h" \ InstrumentationI.obj: \ @@ -3268,7 +3226,6 @@ InstrumentationI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3306,12 +3263,12 @@ InstrumentationI.obj: \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3326,6 +3283,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -3338,7 +3296,6 @@ InstrumentationI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -3384,7 +3341,6 @@ IPEndpointI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3423,19 +3379,18 @@ IPEndpointI.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "ProtocolInstance.h" \ "Instance.h" \ @@ -3452,6 +3407,7 @@ IPEndpointI.obj: \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -3471,6 +3427,7 @@ IPEndpointI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -3522,7 +3479,6 @@ LocatorInfo.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3552,12 +3508,12 @@ LocatorInfo.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3575,6 +3531,7 @@ LocatorInfo.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -3595,7 +3552,7 @@ LocatorInfo.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -3646,7 +3603,6 @@ LoggerAdminI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3684,12 +3640,12 @@ LoggerAdminI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3701,7 +3657,6 @@ LoggerAdminI.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -3713,6 +3668,7 @@ LoggerAdminI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -3750,7 +3706,6 @@ LoggerI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3791,7 +3746,6 @@ LoggerUtil.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3848,11 +3802,10 @@ LoggerUtil.obj: \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3861,6 +3814,7 @@ LoggerUtil.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -3882,6 +3836,7 @@ LoggerUtil.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -3904,7 +3859,6 @@ MetricsAdminI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3941,12 +3895,12 @@ MetricsAdminI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3961,6 +3915,7 @@ MetricsAdminI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -3971,7 +3926,6 @@ MetricsAdminI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -4035,7 +3989,6 @@ MetricsObserverI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4073,12 +4026,12 @@ MetricsObserverI.obj: \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4093,6 +4046,7 @@ MetricsObserverI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -4105,7 +4059,6 @@ MetricsObserverI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -4133,7 +4086,6 @@ Network.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4170,12 +4122,12 @@ Network.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4184,7 +4136,6 @@ Network.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "NetworkProxy.h" \ "$(includedir)\IceUtil\StringUtil.h" \ @@ -4208,6 +4159,7 @@ Network.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -4227,6 +4179,7 @@ Network.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -4258,7 +4211,6 @@ NetworkProxy.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4295,12 +4247,12 @@ NetworkProxy.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4309,7 +4261,6 @@ NetworkProxy.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "HttpParser.h" \ "$(includedir)\Ice\Properties.h" \ @@ -4319,6 +4270,7 @@ NetworkProxy.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -4349,7 +4301,6 @@ Object.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4368,13 +4319,15 @@ Object.obj: \ "$(includedir)\Ice\ConnectionIF.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\ObserverHelper.h" \ @@ -4385,20 +4338,6 @@ Object.obj: \ "IncomingRequest.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -4430,7 +4369,6 @@ ObjectAdapterFactory.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4461,12 +4399,12 @@ ObjectAdapterFactory.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4493,7 +4431,6 @@ ObjectAdapterFactory.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -4524,7 +4461,6 @@ ObjectAdapterI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4555,12 +4491,12 @@ ObjectAdapterI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4587,13 +4523,13 @@ ObjectAdapterI.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ObjectAdapterFactory.h" \ "Instance.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "TraceLevelsF.h" \ "DefaultsAndOverridesF.h" \ "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ "RetryQueueF.h" \ @@ -4612,6 +4548,7 @@ ObjectAdapterI.obj: \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -4654,7 +4591,6 @@ ObjectAdapterI.obj: \ "Selector.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ImplicitContextF.h" \ "DefaultsAndOverrides.h" \ "TraceLevels.h" \ @@ -4678,7 +4614,6 @@ ObserverHelper.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4717,12 +4652,12 @@ ObserverHelper.obj: \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4736,6 +4671,7 @@ ObserverHelper.obj: \ "LocatorInfoF.h" \ "BatchRequestQueue.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "$(includedir)\Ice\OutputStream.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -4763,7 +4699,7 @@ ObserverHelper.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -4800,7 +4736,6 @@ OpaqueEndpointI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4824,7 +4759,7 @@ OpaqueEndpointI.obj: \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ @@ -4838,11 +4773,11 @@ OpaqueEndpointI.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "DefaultsAndOverrides.h" \ @@ -4892,35 +4827,36 @@ Outgoing.obj: \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\ObserverHelper.h" \ @@ -4930,7 +4866,6 @@ Outgoing.obj: \ "..\..\src\IceUtil\StopWatch.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ @@ -4947,7 +4882,6 @@ Outgoing.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "EventHandler.h" \ @@ -4989,6 +4923,7 @@ Outgoing.obj: \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "DefaultsAndOverridesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -5035,7 +4970,6 @@ OutgoingAsync.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -5054,12 +4988,12 @@ OutgoingAsync.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5067,6 +5001,7 @@ OutgoingAsync.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\ConnectionIF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "ConnectionI.h" \ "..\..\src\IceUtil\StopWatch.h" \ "$(includedir)\Ice\Connection.h" \ @@ -5083,7 +5018,6 @@ OutgoingAsync.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "EventHandler.h" \ "EventHandlerF.h" \ @@ -5124,6 +5058,7 @@ OutgoingAsync.obj: \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "DefaultsAndOverridesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -5142,6 +5077,130 @@ OutgoingAsync.obj: \ "$(includedir)\IceUtil\StringUtil.h" \ "RetryQueue.h" \ +OutputStream.obj: \ + OutputStream.cpp \ + "$(includedir)\IceUtil\DisableWarnings.h" \ + "$(includedir)\Ice\OutputStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Atomic.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\ValueF.h" \ + "$(includedir)\Ice\Exception.h" \ + "$(includedir)\Ice\Format.h" \ + "$(includedir)\Ice\LocalObject.h" \ + "$(includedir)\Ice\LocalObjectF.h" \ + "$(includedir)\Ice\StreamHelpers.h" \ + "$(includedir)\IceUtil\ScopedArray.h" \ + "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ + "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\IceUtil\UndefSysMacros.h" \ + "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\InstanceF.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "DefaultsAndOverrides.h" \ + "DefaultsAndOverridesF.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\Proxy.h" \ + "$(includedir)\Ice\ProxyFactoryF.h" \ + "$(includedir)\Ice\ConnectionIF.h" \ + "$(includedir)\Ice\RequestHandlerF.h" \ + "$(includedir)\Ice\EndpointF.h" \ + "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\VirtualShared.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\Endpoint.h" \ + "Network.h" \ + "NetworkF.h" \ + "NetworkProxyF.h" \ + "ProtocolInstanceF.h" \ + "Instance.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\Ice\InstrumentationF.h" \ + "TraceLevelsF.h" \ + "RouterInfoF.h" \ + "LocatorInfoF.h" \ + "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ThreadPoolF.h" \ + "$(includedir)\Ice\ConnectionFactoryF.h" \ + "ACM.h" \ + "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ + "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ + "EndpointFactoryManagerF.h" \ + "IPEndpointIF.h" \ + "RetryQueueF.h" \ + "$(includedir)\Ice\DynamicLibraryF.h" \ + "$(includedir)\Ice\PluginF.h" \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "ImplicitContextI.h" \ + "$(includedir)\Ice\ImplicitContext.h" \ + "$(includedir)\Ice\FacetMap.h" \ + "$(includedir)\Ice\Process.h" \ + "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ + "$(includedir)\Ice\Incoming.h" \ + "$(includedir)\Ice\ServantLocatorF.h" \ + "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ + "ProxyFactory.h" \ + "$(includedir)\Ice\OutgoingAsyncF.h" \ + "$(includedir)\Ice\Properties.h" \ + "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\PropertiesAdmin.h" \ + "TraceUtil.h" \ + "$(includedir)\Ice\LoggerUtil.h" \ + "$(includedir)\Ice\Logger.h" \ + "$(includedir)\Ice\SlicedData.h" \ + PluginManagerI.obj: \ PluginManagerI.cpp \ "$(includedir)\IceUtil\Options.h" \ @@ -5166,7 +5225,6 @@ PluginManagerI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5204,12 +5262,11 @@ PluginManagerI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5223,6 +5280,7 @@ PluginManagerI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -5289,7 +5347,6 @@ PropertiesAdminI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5322,12 +5379,12 @@ PropertiesAdminI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5342,13 +5399,13 @@ PropertiesAdminI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -5376,7 +5433,6 @@ PropertiesI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5408,12 +5464,12 @@ PropertiesI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5428,6 +5484,7 @@ PropertiesI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -5439,7 +5496,6 @@ PropertiesI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -5479,7 +5535,6 @@ Protocol.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5512,7 +5567,6 @@ ProtocolInstance.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5549,12 +5603,12 @@ ProtocolInstance.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5563,7 +5617,6 @@ ProtocolInstance.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ "IPEndpointIF.h" \ @@ -5584,6 +5637,7 @@ ProtocolInstance.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -5604,6 +5658,7 @@ ProtocolInstance.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -5634,7 +5689,6 @@ ProtocolPluginFacade.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5689,11 +5743,11 @@ ProtocolPluginFacade.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5704,7 +5758,7 @@ ProtocolPluginFacade.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -5726,6 +5780,7 @@ ProtocolPluginFacade.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -5763,7 +5818,6 @@ Proxy.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -5788,12 +5842,12 @@ Proxy.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5811,6 +5865,7 @@ Proxy.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -5842,7 +5897,6 @@ Proxy.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "EndpointI.h" \ @@ -5853,6 +5907,7 @@ Proxy.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "TraceLevelsF.h" \ "DefaultsAndOverridesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ "RetryQueueF.h" \ @@ -5879,7 +5934,6 @@ Proxy.obj: \ "RequestHandler.h" \ "ResponseHandler.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Stream.h" \ ProxyFactory.obj: \ ProxyFactory.cpp \ @@ -5906,7 +5960,6 @@ ProxyFactory.obj: \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -5938,12 +5991,12 @@ ProxyFactory.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5958,6 +6011,7 @@ ProxyFactory.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -5979,7 +6033,7 @@ ProxyFactory.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -6034,7 +6088,6 @@ Reference.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6069,12 +6122,12 @@ Reference.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6088,6 +6141,7 @@ Reference.obj: \ "LocatorInfoF.h" \ "BatchRequestQueue.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "$(includedir)\Ice\OutputStream.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -6116,7 +6170,7 @@ Reference.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -6185,7 +6239,6 @@ ReferenceFactory.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6222,12 +6275,12 @@ ReferenceFactory.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6242,11 +6295,11 @@ ReferenceFactory.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -6337,7 +6390,6 @@ RegisterPluginsInit.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6377,12 +6429,12 @@ RegisterPluginsInit.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6391,7 +6443,6 @@ RegisterPluginsInit.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -6426,7 +6477,6 @@ RequestHandler.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -6456,12 +6506,12 @@ RequestHandler.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6475,6 +6525,7 @@ RequestHandler.obj: \ "LocatorInfoF.h" \ "BatchRequestQueue.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "$(includedir)\Ice\OutputStream.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -6526,7 +6577,6 @@ RequestHandlerFactory.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -6539,20 +6589,17 @@ RequestHandlerFactory.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "ConnectRequestHandler.h" \ @@ -6566,10 +6613,13 @@ RequestHandlerFactory.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LocatorF.h" \ "RouterInfoF.h" \ "LocatorInfoF.h" \ @@ -6608,6 +6658,7 @@ RequestHandlerFactory.obj: \ "Instance.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "DefaultsAndOverridesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ "RetryQueueF.h" \ @@ -6640,7 +6691,6 @@ ResponseHandler.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6696,7 +6746,6 @@ RetryQueue.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -6713,17 +6762,18 @@ RetryQueue.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "Instance.h" \ @@ -6745,7 +6795,7 @@ RetryQueue.obj: \ "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -6798,7 +6848,6 @@ RouterInfo.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6830,12 +6879,12 @@ RouterInfo.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6850,6 +6899,7 @@ RouterInfo.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -6900,7 +6950,6 @@ Selector.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6930,12 +6979,12 @@ Selector.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6944,7 +6993,6 @@ Selector.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "EventHandlerF.h" \ "EventHandler.h" \ @@ -6964,6 +7012,7 @@ Selector.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -6984,6 +7033,7 @@ Selector.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -7015,7 +7065,6 @@ ServantManager.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7070,11 +7119,10 @@ ServantManager.obj: \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -7083,6 +7131,7 @@ ServantManager.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -7101,6 +7150,7 @@ ServantManager.obj: \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -7141,7 +7191,6 @@ Service.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7171,11 +7220,11 @@ Service.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -7184,7 +7233,6 @@ Service.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -7196,6 +7244,7 @@ Service.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -7224,7 +7273,6 @@ Service.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -7275,7 +7323,6 @@ SliceChecksums.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7319,7 +7366,6 @@ SlicedData.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7335,200 +7381,17 @@ SlicedData.obj: \ "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - -Stream.obj: \ - Stream.cpp \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\Config.h" \ "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\Ice\Traits.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - -StreamI.obj: \ - StreamI.cpp \ - "StreamI.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\Ice\Traits.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "Instance.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "TraceLevelsF.h" \ - "DefaultsAndOverridesF.h" \ - "RouterInfoF.h" \ - "LocatorInfoF.h" \ - "ReferenceFactoryF.h" \ - "$(includedir)\Ice\ThreadPoolF.h" \ - "$(includedir)\Ice\ConnectionFactoryF.h" \ - "ACM.h" \ - "$(includedir)\Ice\ACMF.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ - "EndpointFactoryManagerF.h" \ - "IPEndpointIF.h" \ - "RetryQueueF.h" \ - "$(includedir)\Ice\DynamicLibraryF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "NetworkF.h" \ - "NetworkProxyF.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "ImplicitContextI.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Value.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultValueFactory.h" \ - "DefaultsAndOverrides.h" \ - "Network.h" \ - "ProtocolInstanceF.h" \ StreamSocket.obj: \ StreamSocket.cpp \ @@ -7551,7 +7414,6 @@ StreamSocket.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7588,12 +7450,12 @@ StreamSocket.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -7602,7 +7464,6 @@ StreamSocket.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "NetworkProxy.h" \ "ProtocolInstance.h" \ @@ -7625,6 +7486,7 @@ StreamSocket.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -7644,6 +7506,7 @@ StreamSocket.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -7674,7 +7537,6 @@ TcpAcceptor.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7711,12 +7573,12 @@ TcpAcceptor.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -7725,7 +7587,6 @@ TcpAcceptor.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TcpTransceiver.h" \ "Transceiver.h" \ "StreamSocket.h" \ @@ -7749,6 +7610,7 @@ TcpAcceptor.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -7768,6 +7630,7 @@ TcpAcceptor.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -7810,7 +7673,6 @@ TcpConnector.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7847,12 +7709,12 @@ TcpConnector.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -7861,7 +7723,6 @@ TcpConnector.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TcpTransceiver.h" \ "Transceiver.h" \ "EndpointIF.h" \ @@ -7885,6 +7746,7 @@ TcpConnector.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -7904,6 +7766,7 @@ TcpConnector.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -7949,7 +7812,6 @@ TcpEndpointI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7988,19 +7850,18 @@ TcpEndpointI.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "EndpointFactory.h" \ "EndpointFactoryF.h" \ @@ -8021,6 +7882,7 @@ TcpEndpointI.obj: \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -8039,6 +7901,7 @@ TcpEndpointI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -8074,7 +7937,6 @@ TcpTransceiver.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8115,12 +7977,12 @@ TcpTransceiver.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -8129,7 +7991,6 @@ TcpTransceiver.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "StreamSocket.h" \ "WSTransceiver.h" \ "ProtocolInstance.h" \ @@ -8151,6 +8012,7 @@ TcpTransceiver.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -8170,6 +8032,7 @@ TcpTransceiver.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -8204,7 +8067,6 @@ ThreadPool.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8236,12 +8098,11 @@ ThreadPool.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -8272,6 +8133,7 @@ ThreadPool.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -8291,6 +8153,7 @@ ThreadPool.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -8326,7 +8189,6 @@ TraceLevels.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8363,12 +8225,12 @@ TraceLevels.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -8384,6 +8246,7 @@ TraceLevels.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -8415,7 +8278,6 @@ TraceUtil.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8463,11 +8325,10 @@ TraceUtil.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -8478,6 +8339,7 @@ TraceUtil.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -8499,6 +8361,7 @@ TraceUtil.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -8525,7 +8388,6 @@ Transceiver.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8566,12 +8428,12 @@ Transceiver.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -8580,7 +8442,6 @@ Transceiver.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ UdpConnector.obj: \ @@ -8608,7 +8469,6 @@ UdpConnector.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8645,12 +8505,12 @@ UdpConnector.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -8659,7 +8519,6 @@ UdpConnector.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstance.h" \ "EndpointIF.h" \ "IPEndpointIF.h" \ @@ -8679,6 +8538,7 @@ UdpConnector.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -8698,6 +8558,7 @@ UdpConnector.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -8740,7 +8601,6 @@ UdpEndpointI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8779,19 +8639,18 @@ UdpEndpointI.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "EndpointFactory.h" \ "EndpointFactoryF.h" \ @@ -8800,6 +8659,7 @@ UdpEndpointI.obj: \ "Connector.h" \ "UdpTransceiver.h" \ "Transceiver.h" \ + "$(includedir)\Ice\OutputStream.h" \ "ProtocolInstance.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -8815,6 +8675,7 @@ UdpEndpointI.obj: \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -8865,7 +8726,6 @@ UdpTransceiver.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8901,12 +8761,12 @@ UdpTransceiver.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -8915,7 +8775,6 @@ UdpTransceiver.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "UdpEndpointI.h" \ "IPEndpointI.h" \ "$(includedir)\IceUtil\Thread.h" \ @@ -8942,6 +8801,7 @@ UdpTransceiver.obj: \ "$(includedir)\Ice\ConnectionFactoryF.h" \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -8960,6 +8820,7 @@ UdpTransceiver.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -8973,20 +8834,18 @@ UdpTransceiver.obj: \ Value.obj: \ Value.cpp \ "$(includedir)\Ice\Value.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\StreamF.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\IceUtil\Shared.h" \ "$(includedir)\IceUtil\Config.h" \ "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\Handle.h" \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ @@ -8997,8 +8856,15 @@ Value.obj: \ "$(includedir)\IceUtil\Iterator.h" \ "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\Ice\Identity.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\OutputStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -9009,63 +8875,34 @@ Value.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ -ValueFactoryManager.obj: \ - ValueFactoryManager.cpp \ +ValueFactoryManagerI.obj: \ + ValueFactoryManagerI.cpp \ "$(includedir)\IceUtil\DisableWarnings.h" \ - "ValueFactoryManager.h" \ + "ValueFactoryManagerI.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\IceUtil\Shared.h" \ "$(includedir)\IceUtil\Config.h" \ "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\Handle.h" \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9075,17 +8912,15 @@ ValueFactoryManager.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\VirtualShared.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ WSAcceptor.obj: \ @@ -9106,7 +8941,6 @@ WSAcceptor.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9151,12 +8985,11 @@ WSAcceptor.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -9185,6 +9018,7 @@ WSAcceptor.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -9204,6 +9038,7 @@ WSAcceptor.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -9233,7 +9068,6 @@ WSConnector.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9276,12 +9110,11 @@ WSConnector.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -9309,6 +9142,7 @@ WSConnector.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -9329,6 +9163,7 @@ WSConnector.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -9362,7 +9197,6 @@ WSEndpoint.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9412,12 +9246,11 @@ WSEndpoint.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -9440,6 +9273,7 @@ WSEndpoint.obj: \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -9459,6 +9293,7 @@ WSEndpoint.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -9492,7 +9327,6 @@ WSTransceiver.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9529,12 +9363,12 @@ WSTransceiver.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -9543,7 +9377,6 @@ WSTransceiver.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ "IPEndpointIF.h" \ @@ -9564,6 +9397,7 @@ WSTransceiver.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -9584,6 +9418,7 @@ WSTransceiver.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -9593,7 +9428,6 @@ WSTransceiver.obj: \ "Network.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\ImplicitContextF.h" \ @@ -9624,7 +9458,6 @@ DLLMain.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9670,19 +9503,18 @@ DLLMain.obj: \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -9694,6 +9526,7 @@ DLLMain.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -9722,7 +9555,6 @@ DLLMain.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ @@ -9750,7 +9582,6 @@ BuiltinSequences.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9760,8 +9591,9 @@ BuiltinSequences.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -9775,13 +9607,14 @@ BuiltinSequences.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ Communicator.obj: \ Communicator.cpp \ @@ -9800,7 +9633,6 @@ Communicator.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9837,12 +9669,12 @@ Communicator.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -9857,11 +9689,11 @@ Communicator.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -9894,7 +9726,6 @@ CommunicatorF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9922,7 +9753,6 @@ Connection.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9959,12 +9789,12 @@ Connection.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -9978,6 +9808,7 @@ Connection.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ + "$(includedir)\Ice\OutputStream.h" \ ConnectionF.obj: \ ConnectionF.cpp \ @@ -9996,7 +9827,6 @@ ConnectionF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10024,7 +9854,6 @@ Current.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10038,8 +9867,9 @@ Current.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10048,13 +9878,14 @@ Current.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ Endpoint.obj: \ Endpoint.cpp \ @@ -10073,7 +9904,6 @@ Endpoint.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10086,8 +9916,9 @@ Endpoint.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10100,13 +9931,14 @@ Endpoint.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ EndpointF.obj: \ EndpointF.cpp \ @@ -10125,7 +9957,6 @@ EndpointF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10153,7 +9984,6 @@ EndpointTypes.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10181,7 +10011,6 @@ FacetMap.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10191,8 +10020,9 @@ FacetMap.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10206,13 +10036,14 @@ FacetMap.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ Identity.obj: \ Identity.cpp \ @@ -10231,7 +10062,6 @@ Identity.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10241,8 +10071,9 @@ Identity.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10255,13 +10086,14 @@ Identity.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ ImplicitContext.obj: \ ImplicitContext.cpp \ @@ -10280,7 +10112,6 @@ ImplicitContext.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10297,8 +10128,9 @@ ImplicitContext.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10307,13 +10139,14 @@ ImplicitContext.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ ImplicitContextF.obj: \ ImplicitContextF.cpp \ @@ -10332,7 +10165,6 @@ ImplicitContextF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10360,7 +10192,6 @@ Instrumentation.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10376,8 +10207,9 @@ Instrumentation.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10386,13 +10218,14 @@ Instrumentation.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ InstrumentationF.obj: \ InstrumentationF.cpp \ @@ -10411,7 +10244,6 @@ InstrumentationF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10439,7 +10271,6 @@ LocalException.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10452,8 +10283,9 @@ LocalException.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10465,13 +10297,14 @@ LocalException.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ Locator.obj: \ Locator.cpp \ @@ -10490,7 +10323,6 @@ Locator.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10527,12 +10359,12 @@ Locator.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -10547,6 +10379,7 @@ Locator.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -10575,7 +10408,6 @@ LocatorF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10612,12 +10444,12 @@ LocatorF.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -10626,6 +10458,7 @@ LocatorF.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\OutputStream.h" \ Logger.obj: \ Logger.cpp \ @@ -10644,7 +10477,6 @@ Logger.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10672,7 +10504,6 @@ LoggerF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10700,7 +10531,6 @@ Metrics.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10737,12 +10567,12 @@ Metrics.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -10757,6 +10587,7 @@ Metrics.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -10783,7 +10614,6 @@ ObjectAdapter.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10820,12 +10650,12 @@ ObjectAdapter.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -10838,6 +10668,7 @@ ObjectAdapter.obj: \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\FacetMap.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\OutputStream.h" \ ObjectAdapterF.obj: \ ObjectAdapterF.cpp \ @@ -10856,7 +10687,6 @@ ObjectAdapterF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10884,7 +10714,6 @@ ObjectFactory.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10894,8 +10723,9 @@ ObjectFactory.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10909,13 +10739,14 @@ ObjectFactory.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ Plugin.obj: \ Plugin.cpp \ @@ -10934,7 +10765,6 @@ Plugin.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10946,8 +10776,9 @@ Plugin.obj: \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10962,12 +10793,12 @@ Plugin.obj: \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ PluginF.obj: \ PluginF.cpp \ @@ -10986,7 +10817,6 @@ PluginF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11014,7 +10844,6 @@ Process.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11051,12 +10880,12 @@ Process.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11071,6 +10900,7 @@ Process.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -11097,7 +10927,6 @@ ProcessF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11134,12 +10963,12 @@ ProcessF.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11148,6 +10977,7 @@ ProcessF.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\OutputStream.h" \ Properties.obj: \ Properties.cpp \ @@ -11166,7 +10996,6 @@ Properties.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11203,12 +11032,12 @@ Properties.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11223,6 +11052,7 @@ Properties.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -11251,7 +11081,6 @@ PropertiesAdmin.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11288,12 +11117,12 @@ PropertiesAdmin.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11308,6 +11137,7 @@ PropertiesAdmin.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -11335,7 +11165,6 @@ PropertiesF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11372,12 +11201,12 @@ PropertiesF.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11386,6 +11215,7 @@ PropertiesF.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\OutputStream.h" \ RemoteLogger.obj: \ RemoteLogger.cpp \ @@ -11404,7 +11234,6 @@ RemoteLogger.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11441,12 +11270,12 @@ RemoteLogger.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11461,6 +11290,7 @@ RemoteLogger.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -11487,7 +11317,6 @@ Router.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11524,12 +11353,12 @@ Router.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11544,6 +11373,7 @@ Router.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -11570,7 +11400,6 @@ RouterF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11607,12 +11436,12 @@ RouterF.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11621,6 +11450,7 @@ RouterF.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\OutputStream.h" \ ServantLocator.obj: \ ServantLocator.cpp \ @@ -11639,7 +11469,6 @@ ServantLocator.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11654,8 +11483,9 @@ ServantLocator.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -11664,13 +11494,14 @@ ServantLocator.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ ServantLocatorF.obj: \ ServantLocatorF.cpp \ @@ -11689,7 +11520,6 @@ ServantLocatorF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11717,7 +11547,6 @@ SliceChecksumDict.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11727,8 +11556,9 @@ SliceChecksumDict.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -11742,13 +11572,14 @@ SliceChecksumDict.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ ValueFactory.obj: \ ValueFactory.cpp \ @@ -11767,7 +11598,6 @@ ValueFactory.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11777,8 +11607,9 @@ ValueFactory.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -11792,12 +11623,13 @@ ValueFactory.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ Version.obj: \ Version.cpp \ @@ -11816,7 +11648,6 @@ Version.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11826,8 +11657,9 @@ Version.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -11840,10 +11672,11 @@ Version.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ diff --git a/cpp/src/Ice/AsyncResult.cpp b/cpp/src/Ice/AsyncResult.cpp index bd8cdc80ccf..37a5581f11a 100644 --- a/cpp/src/Ice/AsyncResult.cpp +++ b/cpp/src/Ice/AsyncResult.cpp @@ -128,12 +128,12 @@ AsyncResult::__throwUserException() { try { - _is.startReadEncaps(); + _is.startEncapsulation(); _is.throwException(); } catch(const Ice::UserException&) { - _is.endReadEncaps(); + _is.endEncapsulation(); throw; } } diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp index 9f5d506545b..ff152dc19ea 100644 --- a/cpp/src/Ice/BatchRequestQueue.cpp +++ b/cpp/src/Ice/BatchRequestQueue.cpp @@ -12,6 +12,7 @@ #include <Ice/Properties.h> using namespace std; +using namespace Ice; using namespace IceInternal; IceUtil::Shared* IceInternal::upCast(BatchRequestQueue* p) { return p; } @@ -87,7 +88,7 @@ BatchRequestQueue::BatchRequestQueue(const InstancePtr& instance, bool datagram) } void -BatchRequestQueue::prepareBatchRequest(BasicStream* os) +BatchRequestQueue::prepareBatchRequest(OutputStream* os) { Lock sync(*this); if(ICE_EXCEPTION_GET(_exception)) @@ -100,7 +101,7 @@ BatchRequestQueue::prepareBatchRequest(BasicStream* os) } void -BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrxPtr& proxy, const std::string& operation) +BatchRequestQueue::finishBatchRequest(OutputStream* os, const Ice::ObjectPrxPtr& proxy, const std::string& operation) { // // No need for synchronization, no other threads are supposed @@ -156,7 +157,7 @@ BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrxPtr& } void -BatchRequestQueue::abortBatchRequest(BasicStream* os) +BatchRequestQueue::abortBatchRequest(OutputStream* os) { Lock sync(*this); if(_batchStreamInUse) @@ -169,7 +170,7 @@ BatchRequestQueue::abortBatchRequest(BasicStream* os) } int -BatchRequestQueue::swap(BasicStream* os) +BatchRequestQueue::swap(OutputStream* os) { Lock sync(*this); if(_batchRequestNum == 0) diff --git a/cpp/src/Ice/BatchRequestQueue.h b/cpp/src/Ice/BatchRequestQueue.h index 64d6bc5f658..62efb23454c 100644 --- a/cpp/src/Ice/BatchRequestQueue.h +++ b/cpp/src/Ice/BatchRequestQueue.h @@ -18,7 +18,7 @@ #include <Ice/BatchRequestInterceptor.h> #include <Ice/BatchRequestQueueF.h> #include <Ice/InstanceF.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> namespace IceInternal { @@ -29,11 +29,11 @@ public: BatchRequestQueue(const InstancePtr&, bool); - void prepareBatchRequest(BasicStream*); - void finishBatchRequest(BasicStream*, const Ice::ObjectPrxPtr&, const std::string&); - void abortBatchRequest(BasicStream*); + void prepareBatchRequest(Ice::OutputStream*); + void finishBatchRequest(Ice::OutputStream*, const Ice::ObjectPrxPtr&, const std::string&); + void abortBatchRequest(Ice::OutputStream*); - int swap(BasicStream*); + int swap(Ice::OutputStream*); void destroy(const Ice::LocalException&); bool isEmpty(); @@ -49,7 +49,7 @@ private: #else Ice::BatchRequestInterceptorPtr _interceptor; #endif - BasicStream _batchStream; + Ice::OutputStream _batchStream; bool _batchStreamInUse; bool _batchStreamCanFlush; int _batchRequestNum; diff --git a/cpp/src/Ice/Buffer.cpp b/cpp/src/Ice/Buffer.cpp index 8f29d39b6a6..b906c99ae74 100644 --- a/cpp/src/Ice/Buffer.cpp +++ b/cpp/src/Ice/Buffer.cpp @@ -37,6 +37,45 @@ IceInternal::Buffer::Container::Container(const_iterator beg, const_iterator end { } +IceInternal::Buffer::Container::Container(const vector<value_type>& v) : + _capacity(0), + _shrinkCounter(0) +{ + if(v.empty()) + { + _buf = 0; + _size = 0; + } + else + { + _buf = const_cast<value_type*>(&v[0]); + _size = v.size(); + } +} + +IceInternal::Buffer::Container::Container(Container& other, bool adopt) +{ + if(adopt) + { + _buf = other._buf; + _size = other._size; + _capacity = other._capacity; + _shrinkCounter = other._shrinkCounter; + + other._buf = 0; + other._size = 0; + other._capacity = 0; + other._shrinkCounter = 0; + } + else + { + _buf = other._buf; + _size = other._size; + _capacity = 0; + _shrinkCounter = 0; + } +} + IceInternal::Buffer::Container::~Container() { if(_buf && _capacity > 0) diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp index 87a3d09c0f2..d57d9d72934 100644 --- a/cpp/src/Ice/CollocatedRequestHandler.cpp +++ b/cpp/src/Ice/CollocatedRequestHandler.cpp @@ -31,7 +31,7 @@ class InvokeAll : public DispatchWorkItem public: InvokeAll(OutgoingBase* out, - BasicStream* os, + OutputStream* os, CollocatedRequestHandler* handler, Int requestId, Int batchRequestNum) : @@ -59,7 +59,7 @@ public: private: OutgoingBase* _out; - BasicStream* _os; + OutputStream* _os; CollocatedRequestHandlerPtr _handler; Int _requestId; Int _batchRequestNum; @@ -70,7 +70,7 @@ class InvokeAllAsync : public DispatchWorkItem public: InvokeAllAsync(const OutgoingAsyncBasePtr& outAsync, - BasicStream* os, + OutputStream* os, const CollocatedRequestHandlerPtr& handler, Int requestId, Int batchRequestNum) : @@ -90,14 +90,14 @@ public: private: OutgoingAsyncBasePtr _outAsync; - BasicStream* _os; + OutputStream* _os; CollocatedRequestHandlerPtr _handler; Int _requestId; Int _batchRequestNum; }; void -fillInValue(BasicStream* os, int pos, Int value) +fillInValue(OutputStream* os, int pos, Int value) { const Byte* p = reinterpret_cast<const Byte*>(&value); #ifdef ICE_BIG_ENDIAN @@ -316,25 +316,27 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int ba } void -CollocatedRequestHandler::sendResponse(Int requestId, BasicStream* os, Byte, bool amd) +CollocatedRequestHandler::sendResponse(Int requestId, OutputStream* os, Byte, bool amd) { OutgoingAsyncBasePtr outAsync; { Lock sync(*this); assert(_response); - os->i = os->b.begin() + sizeof(replyHdr) + 4; + InputStream is(os->instance(), os->getEncoding(), *os, true); // Adopting the OutputStream's buffer. + + is.i = is.b.begin() + sizeof(replyHdr) + 4; if(_traceLevels->protocol >= 1) { fillInValue(os, 10, static_cast<Int>(os->b.size())); - traceRecv(*os, _logger, _traceLevels); + traceRecv(is, _logger, _traceLevels); } map<int, OutgoingBase*>::iterator p = _requests.find(requestId); if(p != _requests.end()) { - p->second->completed(*os); + p->second->completed(is); _requests.erase(p); } else @@ -342,7 +344,7 @@ CollocatedRequestHandler::sendResponse(Int requestId, BasicStream* os, Byte, boo map<int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.find(requestId); if(q != _asyncRequests.end()) { - os->swap(*q->second->getIs()); + is.swap(*q->second->getIs()); if(q->second->completed()) { outAsync = q->second; @@ -442,15 +444,17 @@ CollocatedRequestHandler::sentAsync(OutgoingAsyncBase* outAsync) } void -CollocatedRequestHandler::invokeAll(BasicStream* os, Int requestId, Int batchRequestNum) +CollocatedRequestHandler::invokeAll(OutputStream* os, Int requestId, Int batchRequestNum) { + InputStream is(os->instance(), os->getEncoding(), *os); + if(batchRequestNum > 0) { - os->i = os->b.begin() + sizeof(requestBatchHdr); + is.i = is.b.begin() + sizeof(requestBatchHdr); } else { - os->i = os->b.begin() + sizeof(requestHdr); + is.i = is.b.begin() + sizeof(requestHdr); } if(_traceLevels->protocol >= 1) @@ -490,7 +494,7 @@ CollocatedRequestHandler::invokeAll(BasicStream* os, Int requestId, Int batchReq } Incoming in(_reference->getInstance().get(), this, 0, _adapter, _response, 0, requestId); - in.invoke(servantManager, os); + in.invoke(servantManager, &is); --invokeNum; } } diff --git a/cpp/src/Ice/CollocatedRequestHandler.h b/cpp/src/Ice/CollocatedRequestHandler.h index c4baefb7b30..809c79cb9e9 100644 --- a/cpp/src/Ice/CollocatedRequestHandler.h +++ b/cpp/src/Ice/CollocatedRequestHandler.h @@ -15,7 +15,7 @@ #include <Ice/RequestHandler.h> #include <Ice/ResponseHandler.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> #include <Ice/ObjectAdapterF.h> #include <Ice/LoggerF.h> #include <Ice/TraceLevelsF.h> @@ -55,7 +55,7 @@ public: virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&); virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&); - virtual void sendResponse(Ice::Int, BasicStream*, Ice::Byte, bool); + virtual void sendResponse(Ice::Int, Ice::OutputStream*, Ice::Byte, bool); virtual void sendNoResponse(); virtual bool systemException(Ice::Int, const Ice::SystemException&, bool); virtual void invokeException(Ice::Int, const Ice::LocalException&, int, bool); @@ -71,7 +71,7 @@ public: bool sent(OutgoingBase*); bool sentAsync(OutgoingAsyncBase*); - void invokeAll(BasicStream*, Ice::Int, Ice::Int); + void invokeAll(Ice::OutputStream*, Ice::Int, Ice::Int); private: diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index 60d7b871275..8d13727d9ea 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -14,7 +14,6 @@ #include <Ice/ConnectionFactory.h> #include <Ice/ReferenceFactory.h> #include <Ice/ProxyFactory.h> -#include <Ice/ValueFactoryManager.h> #include <Ice/ObjectAdapterFactory.h> #include <Ice/LoggerUtil.h> #include <Ice/LocalException.h> @@ -133,41 +132,15 @@ Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const Rout void Ice::CommunicatorI::addObjectFactory(const ::Ice::ObjectFactoryPtr& factory, const string& id) { - _instance->servantFactoryManager()->add(factory, id); + _instance->addObjectFactory(factory, id); } ::Ice::ObjectFactoryPtr Ice::CommunicatorI::findObjectFactory(const string& id) const { - return _instance->servantFactoryManager()->findObjectFactory(id); + return _instance->findObjectFactory(id); } -#ifdef ICE_CPP11_MAPPING -void -Ice::CommunicatorI::addValueFactory(function<::Ice::ValuePtr (string)> factory, const string& id) -{ - _instance->servantFactoryManager()->add(move(factory), id); -} - -function<::Ice::ValuePtr (const string&)> -Ice::CommunicatorI::findValueFactory(const string& id) const -{ - return _instance->servantFactoryManager()->find(id); -} -#else -void -Ice::CommunicatorI::addValueFactory(const ::Ice::ValueFactoryPtr& factory, const string& id) -{ - _instance->servantFactoryManager()->add(factory, id); -} - -::Ice::ValueFactoryPtr -Ice::CommunicatorI::findValueFactory(const string& id) const -{ - return _instance->servantFactoryManager()->find(id); -} -#endif - PropertiesPtr Ice::CommunicatorI::getProperties() const { @@ -222,6 +195,12 @@ Ice::CommunicatorI::getPluginManager() const return _instance->pluginManager(); } +ValueFactoryManagerPtr +Ice::CommunicatorI::getValueFactoryManager() const +{ + return _instance->initializationData().valueFactoryManager; +} + namespace { diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h index 4472e688097..50e0d44973b 100644 --- a/cpp/src/Ice/CommunicatorI.h +++ b/cpp/src/Ice/CommunicatorI.h @@ -49,14 +49,6 @@ public: virtual void addObjectFactory(const ObjectFactoryPtr&, const std::string&); virtual ObjectFactoryPtr findObjectFactory(const std::string&) const; -#ifdef ICE_CPP11_MAPPING - virtual void addValueFactory(std::function<std::shared_ptr<Ice::Value> (std::string)>, const ::std::string&); - virtual std::function<::std::shared_ptr<Ice::Value> (const std::string&)> findValueFactory(const std::string&) const; -#else - virtual void addValueFactory(const ValueFactoryPtr&, const std::string&); - virtual ValueFactoryPtr findValueFactory(const std::string&) const; -#endif - virtual ImplicitContextPtr getImplicitContext() const; virtual PropertiesPtr getProperties() const; @@ -71,6 +63,8 @@ public: virtual PluginManagerPtr getPluginManager() const; + virtual ValueFactoryManagerPtr getValueFactoryManager() const; + virtual void flushBatchRequests(); #ifdef ICE_CPP11_MAPPING @@ -97,8 +91,9 @@ public: private: - static CommunicatorIPtr - create(const InitializationData&); + CommunicatorI() {} + + static CommunicatorIPtr create(const InitializationData&); // // Certain initialization tasks need to be completed after the diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h index e8e3cc52686..ce441a4489f 100644 --- a/cpp/src/Ice/ConnectRequestHandler.h +++ b/cpp/src/Ice/ConnectRequestHandler.h @@ -19,7 +19,6 @@ #include <Ice/Reference.h> #include <Ice/RouterInfo.h> #include <Ice/ProxyF.h> -#include <Ice/BasicStream.h> #include <deque> #include <set> diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index c0c1f55df22..2c8688b7a00 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -74,7 +74,7 @@ public: const vector<ConnectionI::OutgoingMessage>& sentCBs, Byte compress, Int requestId, Int invokeNum, const ServantManagerPtr& servantManager, const ObjectAdapterPtr& adapter, const OutgoingAsyncBasePtr& outAsync, const ICE_HEARTBEAT_CALLBACK& heartbeatCallback, - BasicStream& stream) : + InputStream& stream) : DispatchWorkItem(connection), _connection(connection), _startCB(startCB), @@ -110,7 +110,7 @@ private: const ObjectAdapterPtr _adapter; const OutgoingAsyncBasePtr _outAsync; const ICE_HEARTBEAT_CALLBACK _heartbeatCallback; - BasicStream _stream; + InputStream _stream; }; class FinishCall : public DispatchWorkItem @@ -212,7 +212,7 @@ Ice::ConnectionI::Observer::attach(const Ice::Instrumentation::ConnectionObserve void -Ice::ConnectionI::OutgoingMessage::adopt(BasicStream* str) +Ice::ConnectionI::OutgoingMessage::adopt(OutputStream* str) { if(adopted) { @@ -241,7 +241,7 @@ Ice::ConnectionI::OutgoingMessage::adopt(BasicStream* str) } assert(str); - stream = new BasicStream(str->instance(), currentProtocolEncoding); + stream = new OutputStream(str->instance(), currentProtocolEncoding); stream->swap(*str); adopted = true; } @@ -614,7 +614,7 @@ Ice::ConnectionI::monitor(const IceUtil::Time& now, const ACMConfig& acm) bool Ice::ConnectionI::sendRequest(OutgoingBase* out, bool compress, bool response, int batchRequestNum) { - BasicStream* os = out->os(); + OutputStream* os = out->os(); IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); // @@ -706,7 +706,7 @@ Ice::ConnectionI::sendRequest(OutgoingBase* out, bool compress, bool response, i AsyncStatus Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncBasePtr& out, bool compress, bool response, int batchRequestNum) { - BasicStream* os = out->getOs(); + OutputStream* os = out->getOs(); IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); // @@ -1248,7 +1248,7 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con } void -Ice::ConnectionI::sendResponse(Int, BasicStream* os, Byte compressFlag, bool /*amd*/) +Ice::ConnectionI::sendResponse(Int, OutputStream* os, Byte compressFlag, bool /*amd*/) { IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); assert(_state > StateNotValidated); @@ -1800,7 +1800,7 @@ void ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingMessage>& sentCBs, Byte compress, Int requestId, Int invokeNum, const ServantManagerPtr& servantManager, const ObjectAdapterPtr& adapter, const OutgoingAsyncBasePtr& outAsync, - const ICE_HEARTBEAT_CALLBACK& heartbeatCallback, BasicStream& stream) + const ICE_HEARTBEAT_CALLBACK& heartbeatCallback, InputStream& stream) { int dispatchedCount = 0; @@ -2649,7 +2649,7 @@ Ice::ConnectionI::initiateShutdown() // // Before we shut down, we send a close connection message. // - BasicStream os(_instance.get(), Ice::currentProtocolEncoding); + OutputStream os(_instance.get(), Ice::currentProtocolEncoding); os.write(magic[0]); os.write(magic[1]); os.write(magic[2]); @@ -2689,7 +2689,7 @@ Ice::ConnectionI::heartbeat() if(!_endpoint->datagram()) { - BasicStream os(_instance.get(), Ice::currentProtocolEncoding); + OutputStream os(_instance.get(), Ice::currentProtocolEncoding); os.write(magic[0]); os.write(magic[1]); os.write(magic[2]); @@ -2939,7 +2939,7 @@ Ice::ConnectionI::sendNextMessage(vector<OutgoingMessage>& callbacks) // // Do compression. // - BasicStream stream(_instance.get(), Ice::currentProtocolEncoding); + OutputStream stream(_instance.get(), Ice::currentProtocolEncoding); doCompress(*message->stream, stream); if(message->outAsync) @@ -3068,7 +3068,7 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message) // // Do compression. // - BasicStream stream(_instance.get(), Ice::currentProtocolEncoding); + OutputStream stream(_instance.get(), Ice::currentProtocolEncoding); doCompress(*message.stream, stream); stream.i = stream.b.begin(); @@ -3244,7 +3244,7 @@ getBZ2Error(int bzError) } void -Ice::ConnectionI::doCompress(BasicStream& uncompressed, BasicStream& compressed) +Ice::ConnectionI::doCompress(OutputStream& uncompressed, OutputStream& compressed) { const Byte* p; @@ -3299,7 +3299,7 @@ Ice::ConnectionI::doCompress(BasicStream& uncompressed, BasicStream& compressed) } void -Ice::ConnectionI::doUncompress(BasicStream& compressed, BasicStream& uncompressed) +Ice::ConnectionI::doUncompress(InputStream& compressed, InputStream& uncompressed) { Int uncompressedSize; compressed.i = compressed.b.begin() + headerSize; @@ -3334,7 +3334,7 @@ Ice::ConnectionI::doUncompress(BasicStream& compressed, BasicStream& uncompresse #endif SocketOperation -Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& requestId, Byte& compress, +Ice::ConnectionI::parseMessage(InputStream& stream, Int& invokeNum, Int& requestId, Byte& compress, ServantManagerPtr& servantManager, ObjectAdapterPtr& adapter, OutgoingAsyncBasePtr& outAsync, ICE_HEARTBEAT_CALLBACK& heartbeatCallback, int& dispatchCount) @@ -3372,7 +3372,7 @@ Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& request if(compress == 2) { #ifdef ICE_HAS_BZIP2 - BasicStream ustream(_instance.get(), Ice::currentProtocolEncoding); + InputStream ustream(_instance.get(), Ice::currentProtocolEncoding); doUncompress(stream, ustream); stream.b.swap(ustream.b); #else @@ -3602,7 +3602,7 @@ Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& request } void -Ice::ConnectionI::invokeAll(BasicStream& stream, Int invokeNum, Int requestId, Byte compress, +Ice::ConnectionI::invokeAll(InputStream& stream, Int invokeNum, Int requestId, Byte compress, const ServantManagerPtr& servantManager, const ObjectAdapterPtr& adapter) { // diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index 0b2f3e66b97..1d44498610b 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -39,6 +39,8 @@ #include <Ice/BatchRequestQueueF.h> #include <Ice/ACM.h> #include <Ice/VirtualShared.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <deque> @@ -93,7 +95,7 @@ public: struct OutgoingMessage { - OutgoingMessage(IceInternal::BasicStream* str, bool comp) : + OutgoingMessage(Ice::OutputStream* str, bool comp) : stream(str), out(0), compress(comp), requestId(0), adopted(false) #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) , isSent(false), invokeSent(false), receivedReply(false) @@ -101,7 +103,7 @@ public: { } - OutgoingMessage(IceInternal::OutgoingBase* o, IceInternal::BasicStream* str, bool comp, int rid) : + OutgoingMessage(IceInternal::OutgoingBase* o, Ice::OutputStream* str, bool comp, int rid) : stream(str), out(o), compress(comp), requestId(rid), adopted(false) #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) , isSent(false), invokeSent(false), receivedReply(false) @@ -109,7 +111,7 @@ public: { } - OutgoingMessage(const IceInternal::OutgoingAsyncBasePtr& o, IceInternal::BasicStream* str, + OutgoingMessage(const IceInternal::OutgoingAsyncBasePtr& o, Ice::OutputStream* str, bool comp, int rid) : stream(str), out(0), outAsync(o), compress(comp), requestId(rid), adopted(false) #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) @@ -118,12 +120,12 @@ public: { } - void adopt(IceInternal::BasicStream*); + void adopt(Ice::OutputStream*); void canceled(bool); bool sent(); void completed(const Ice::LocalException&); - IceInternal::BasicStream* stream; + Ice::OutputStream* stream; IceInternal::OutgoingBase* out; IceInternal::OutgoingAsyncBasePtr outAsync; bool compress; @@ -216,7 +218,7 @@ public: virtual void requestCanceled(IceInternal::OutgoingBase*, const LocalException&); virtual void asyncRequestCanceled(const IceInternal::OutgoingAsyncBasePtr&, const LocalException&); - virtual void sendResponse(Int, IceInternal::BasicStream*, Byte, bool); + virtual void sendResponse(Int, Ice::OutputStream*, Byte, bool); virtual void sendNoResponse(); virtual bool systemException(Int, const SystemException&, bool); virtual void invokeException(Ice::Int, const LocalException&, int, bool); @@ -255,7 +257,7 @@ public: void dispatch(const StartCallbackPtr&, const std::vector<OutgoingMessage>&, Byte, Int, Int, const IceInternal::ServantManagerPtr&, const ObjectAdapterPtr&, const IceInternal::OutgoingAsyncBasePtr&, - const ICE_HEARTBEAT_CALLBACK&, IceInternal::BasicStream&); + const ICE_HEARTBEAT_CALLBACK&, Ice::InputStream&); void finish(bool); void closeCallback(const ICE_CLOSE_CALLBACK&); @@ -300,15 +302,15 @@ private: IceInternal::AsyncStatus sendMessage(OutgoingMessage&); #ifdef ICE_HAS_BZIP2 - void doCompress(IceInternal::BasicStream&, IceInternal::BasicStream&); - void doUncompress(IceInternal::BasicStream&, IceInternal::BasicStream&); + void doCompress(Ice::OutputStream&, Ice::OutputStream&); + void doUncompress(Ice::InputStream&, Ice::InputStream&); #endif - IceInternal::SocketOperation parseMessage(IceInternal::BasicStream&, Int&, Int&, Byte&, + IceInternal::SocketOperation parseMessage(Ice::InputStream&, Int&, Int&, Byte&, IceInternal::ServantManagerPtr&, ObjectAdapterPtr&, IceInternal::OutgoingAsyncBasePtr&, ICE_HEARTBEAT_CALLBACK&, int&); - void invokeAll(IceInternal::BasicStream&, Int, Int, Byte, + void invokeAll(Ice::InputStream&, Int, Int, Byte, const IceInternal::ServantManagerPtr&, const ObjectAdapterPtr&); void scheduleTimeout(IceInternal::SocketOperation status); @@ -377,9 +379,9 @@ private: std::deque<OutgoingMessage> _sendStreams; - IceInternal::BasicStream _readStream; + Ice::InputStream _readStream; bool _readHeader; - IceInternal::BasicStream _writeStream; + Ice::OutputStream _writeStream; Observer _observer; diff --git a/cpp/src/Ice/EndpointFactory.h b/cpp/src/Ice/EndpointFactory.h index 79873ae5c50..5ff16fbc088 100644 --- a/cpp/src/Ice/EndpointFactory.h +++ b/cpp/src/Ice/EndpointFactory.h @@ -17,10 +17,15 @@ #include <Ice/CommunicatorF.h> #include <Ice/Plugin.h> -namespace IceInternal +namespace Ice { -class BasicStream; +class InputStream; + +} + +namespace IceInternal +{ class ICE_API EndpointFactory : public ::IceUtil::Shared { @@ -31,7 +36,7 @@ public: virtual ::Ice::Short type() const = 0; virtual ::std::string protocol() const = 0; virtual EndpointIPtr create(std::vector<std::string>&, bool) const = 0; - virtual EndpointIPtr read(BasicStream*) const = 0; + virtual EndpointIPtr read(Ice::InputStream*) const = 0; virtual void destroy() = 0; virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const = 0; diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp index 6830eda8521..5ac223e57fc 100644 --- a/cpp/src/Ice/EndpointFactoryManager.cpp +++ b/cpp/src/Ice/EndpointFactoryManager.cpp @@ -10,7 +10,8 @@ #include <Ice/EndpointFactoryManager.h> #include <Ice/Endpoint.h> #include <Ice/OpaqueEndpointI.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> #include <Ice/Instance.h> #include <Ice/Properties.h> @@ -122,7 +123,7 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint) // Code below left in place for debugging. EndpointIPtr e = factory->create(str.substr(end), oaEndpoint); - BasicStream bs(_instance.get(), Ice::currentProtocolEncoding); + OutputStream bs(_instance.get(), Ice::currentProtocolEncoding); e->streamWrite(&bs); bs.i = bs.b.begin(); short type; @@ -155,15 +156,15 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint) // and ask the factory to read the endpoint data from that stream to create // the actual endpoint. // - BasicStream bs(_instance.get(), Ice::currentProtocolEncoding); + OutputStream bs(_instance.get(), Ice::currentProtocolEncoding); bs.write(ue->type()); ue->streamWrite(&bs); - bs.i = bs.b.begin(); + InputStream is(bs.instance(), bs.getEncoding(), bs); short type; - bs.read(type); - bs.startReadEncaps(); - EndpointIPtr e = factory->read(&bs); - bs.endReadEncaps(); + is.read(type); + is.startEncapsulation(); + EndpointIPtr e = factory->read(&is); + is.endEncapsulation(); return e; } return ue; // Endpoint is opaque, but we don't have a factory for its type. @@ -173,7 +174,7 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint) } EndpointIPtr -IceInternal::EndpointFactoryManager::read(BasicStream* s) const +IceInternal::EndpointFactoryManager::read(InputStream* s) const { Short type; s->read(type); @@ -181,7 +182,7 @@ IceInternal::EndpointFactoryManager::read(BasicStream* s) const EndpointFactoryPtr factory = get(type); EndpointIPtr e; - s->startReadEncaps(); + s->startEncapsulation(); if(factory) { @@ -192,7 +193,7 @@ IceInternal::EndpointFactoryManager::read(BasicStream* s) const e = ICE_MAKE_SHARED(OpaqueEndpointI, type, s); } - s->endReadEncaps(); + s->endEncapsulation(); return e; } diff --git a/cpp/src/Ice/EndpointFactoryManager.h b/cpp/src/Ice/EndpointFactoryManager.h index 522691982c6..fc1e911bb49 100644 --- a/cpp/src/Ice/EndpointFactoryManager.h +++ b/cpp/src/Ice/EndpointFactoryManager.h @@ -17,10 +17,15 @@ #include <Ice/EndpointFactoryF.h> #include <Ice/EndpointFactoryManagerF.h> -namespace IceInternal +namespace Ice { -class BasicStream; +class InputStream; + +} + +namespace IceInternal +{ class EndpointFactoryManager : public ::IceUtil::Shared, public ::IceUtil::Mutex { @@ -29,7 +34,7 @@ public: void add(const EndpointFactoryPtr&); EndpointFactoryPtr get(::Ice::Short) const; EndpointIPtr create(const std::string&, bool) const; - EndpointIPtr read(BasicStream*) const; + EndpointIPtr read(Ice::InputStream*) const; private: diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h index 1fb691ddd12..9385855f5ba 100644 --- a/cpp/src/Ice/EndpointI.h +++ b/cpp/src/Ice/EndpointI.h @@ -18,10 +18,16 @@ #include <Ice/AcceptorF.h> #include <Ice/VirtualShared.h> -namespace IceInternal +namespace Ice { -class BasicStream; +class OutputStream; +class InputStream; + +} + +namespace IceInternal +{ class ICE_API EndpointI_connectors : public virtual ICE_SHARED { @@ -40,7 +46,7 @@ public: // // Marshal the endpoint. // - virtual void streamWrite(BasicStream*) const = 0; + virtual void streamWrite(Ice::OutputStream*) const = 0; // // Return the endpoint type. diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h index 9394984f339..1081abb7424 100644 --- a/cpp/src/Ice/EventHandler.h +++ b/cpp/src/Ice/EventHandler.h @@ -14,7 +14,6 @@ #include <Ice/EventHandlerF.h> #include <Ice/InstanceF.h> #include <Ice/ThreadPoolF.h> -#include <Ice/BasicStream.h> #include <Ice/Network.h> #include <Ice/VirtualShared.h> diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp index 20203c94d52..8377c6c2230 100644 --- a/cpp/src/Ice/Exception.cpp +++ b/cpp/src/Ice/Exception.cpp @@ -12,8 +12,8 @@ #include <Ice/Network.h> #include <Ice/Plugin.h> #include <Ice/SlicedData.h> -#include <Ice/BasicStream.h> -#include <Ice/Stream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <IceUtil/StringUtil.h> #ifdef ICE_OS_WINRT # include <IceUtil/StringConverter.h> @@ -103,23 +103,7 @@ throwMarshalException(const char* file, int line, const string& reason) } void -Ice::UserException::__write(::IceInternal::BasicStream* os) const -{ - os->startWriteException(0); - __writeImpl(os); - os->endWriteException(); -} - -void -Ice::UserException::__read(::IceInternal::BasicStream* is) -{ - is->startReadException(); - __readImpl(is); - is->endReadException(false); -} - -void -Ice::UserException::__write(const Ice::OutputStreamPtr& os) const +Ice::UserException::__write(::Ice::OutputStream* os) const { os->startException(0); __writeImpl(os); @@ -127,25 +111,13 @@ Ice::UserException::__write(const Ice::OutputStreamPtr& os) const } void -Ice::UserException::__read(const Ice::InputStreamPtr& is) +Ice::UserException::__read(::Ice::InputStream* is) { is->startException(); __readImpl(is); is->endException(false); } -void -Ice::UserException::__writeImpl(const Ice::OutputStreamPtr&) const -{ - throw MarshalException(__FILE__, __LINE__, "user exception was not generated with stream support"); -} - -void -Ice::UserException::__readImpl(const Ice::InputStreamPtr&) -{ - throw MarshalException(__FILE__, __LINE__, "user exception was not generated with stream support"); -} - bool Ice::UserException::__usesClasses() const { diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp index 78d2c88434f..d8b37ec8b58 100644 --- a/cpp/src/Ice/FactoryTable.cpp +++ b/cpp/src/Ice/FactoryTable.cpp @@ -17,7 +17,7 @@ using namespace std; // If the factory is present already, increment its reference count. // void -IceInternal::FactoryTable::addExceptionFactory(const string& t, const IceInternal::UserExceptionFactoryPtr& f) +IceInternal::FactoryTable::addExceptionFactory(const string& t, const Ice::UserExceptionFactoryPtr& f) { IceUtil::Mutex::Lock lock(_m); assert(f); @@ -35,12 +35,12 @@ IceInternal::FactoryTable::addExceptionFactory(const string& t, const IceInterna // // Return the exception factory for a given type ID // -IceInternal::UserExceptionFactoryPtr +Ice::UserExceptionFactoryPtr IceInternal::FactoryTable::getExceptionFactory(const string& t) const { IceUtil::Mutex::Lock lock(_m); EFTable::const_iterator i = _eft.find(t); - return i != _eft.end() ? i->second.first : IceInternal::UserExceptionFactoryPtr(); + return i != _eft.end() ? i->second.first : Ice::UserExceptionFactoryPtr(); } // diff --git a/cpp/src/Ice/HttpParser.cpp b/cpp/src/Ice/HttpParser.cpp index ab0ae40bcc4..90f0979e7c1 100644 --- a/cpp/src/Ice/HttpParser.cpp +++ b/cpp/src/Ice/HttpParser.cpp @@ -9,7 +9,6 @@ #include <IceUtil/Config.h> #include <Ice/HttpParser.h> -#include <Ice/BasicStream.h> #include <Ice/LocalException.h> #include <IceUtil/StringUtil.h> diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp index 82da554a960..fd03236dbd9 100644 --- a/cpp/src/Ice/IPEndpointI.cpp +++ b/cpp/src/Ice/IPEndpointI.cpp @@ -18,6 +18,7 @@ #include <IceUtil/MutexPtrLock.h> using namespace std; +using namespace Ice; using namespace Ice::Instrumentation; using namespace IceInternal; @@ -105,11 +106,11 @@ IceInternal::IPEndpointI::secure() const } void -IceInternal::IPEndpointI::streamWrite(BasicStream* s) const +IceInternal::IPEndpointI::streamWrite(OutputStream* s) const { - s->startWriteEncaps(); + s->startEncapsulation(); streamWriteImpl(s); - s->endWriteEncaps(); + s->endEncapsulation(); } const string& @@ -354,7 +355,7 @@ IceInternal::IPEndpointI::connectors(const vector<Address>& addresses, const Net } void -IceInternal::IPEndpointI::streamWriteImpl(BasicStream* s) const +IceInternal::IPEndpointI::streamWriteImpl(OutputStream* s) const { s->write(_host, false); s->write(_port); @@ -496,7 +497,7 @@ IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance) : { } -IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance, BasicStream* s) : +IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance, InputStream* s) : _instance(instance), _port(0), _hashInitialized(false) diff --git a/cpp/src/Ice/IPEndpointI.h b/cpp/src/Ice/IPEndpointI.h index 8e5e033647f..eb899cd5921 100644 --- a/cpp/src/Ice/IPEndpointI.h +++ b/cpp/src/Ice/IPEndpointI.h @@ -51,7 +51,7 @@ public: virtual Ice::Short type() const; virtual const std::string& protocol() const; virtual bool secure() const; - virtual void streamWrite(BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; virtual const std::string& connectionId() const; virtual EndpointIPtr connectionId(const ::std::string&) const; @@ -74,7 +74,7 @@ public: const std::string& host() const; int port() const; - virtual void streamWriteImpl(BasicStream*) const; + virtual void streamWriteImpl(Ice::OutputStream*) const; virtual void hashInit(Ice::Int&) const; virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const; @@ -93,7 +93,7 @@ protected: IPEndpointI(const ProtocolInstancePtr&, const std::string&, int, const Address&, const std::string&); IPEndpointI(const ProtocolInstancePtr&); - IPEndpointI(const ProtocolInstancePtr&, BasicStream*); + IPEndpointI(const ProtocolInstancePtr&, Ice::InputStream*); const ProtocolInstancePtr _instance; const std::string _host; diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp index a4d58f9e9b7..96905f661f2 100644 --- a/cpp/src/Ice/ImplicitContextI.cpp +++ b/cpp/src/Ice/ImplicitContextI.cpp @@ -8,7 +8,7 @@ // ********************************************************************** #include <Ice/ImplicitContextI.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> #include <Ice/Object.h> #include <IceUtil/Mutex.h> #include <IceUtil/MutexPtrLock.h> @@ -31,7 +31,7 @@ public: virtual string put(const string&, const string&); virtual string remove(const string&); - virtual void write(const Context&, ::IceInternal::BasicStream*) const; + virtual void write(const Context&, ::Ice::OutputStream*) const; virtual void combine(const Context&, Context&) const; private: @@ -55,7 +55,7 @@ public: virtual string put(const string&, const string&); virtual string remove(const string&); - virtual void write(const Context&, ::IceInternal::BasicStream*) const; + virtual void write(const Context&, ::Ice::OutputStream*) const; virtual void combine(const Context&, Context&) const; struct Slot @@ -217,7 +217,7 @@ SharedImplicitContext::remove(const string& k) } void -SharedImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream* s) const +SharedImplicitContext::write(const Context& proxyCtx, ::Ice::OutputStream* s) const { IceUtil::Mutex::Lock lock(_mutex); if(proxyCtx.size() == 0) @@ -577,7 +577,7 @@ PerThreadImplicitContext::remove(const string& k) } void -PerThreadImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream* s) const +PerThreadImplicitContext::write(const Context& proxyCtx, ::Ice::OutputStream* s) const { const Context* threadCtx = getThreadContext(false); diff --git a/cpp/src/Ice/ImplicitContextI.h b/cpp/src/Ice/ImplicitContextI.h index 3fa3292fb1f..22c52e38bf1 100644 --- a/cpp/src/Ice/ImplicitContextI.h +++ b/cpp/src/Ice/ImplicitContextI.h @@ -36,7 +36,7 @@ public: // (entries in the given context overwrite entries in // the underlying context) // - virtual void write(const Context&, ::IceInternal::BasicStream*) const = 0; + virtual void write(const Context&, ::Ice::OutputStream*) const = 0; // // Combines the underlying context plus the given context diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index 18b0e23301f..fafdb3cce83 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -89,7 +89,7 @@ IceInternal::IncomingBase::__adopt(IncomingBase& other) other._responseHandler = 0; } -BasicStream* +OutputStream* IncomingBase::__startWriteParams(FormatType format) { if(!_response) @@ -100,7 +100,7 @@ IncomingBase::__startWriteParams(FormatType format) assert(_os.b.size() == headerSize + 4); // Reply status position. assert(_current.encoding >= Ice::Encoding_1_0); // Encoding for reply is known. _os.write(static_cast<Ice::Byte>(0)); - _os.startWriteEncaps(_current.encoding, format); + _os.startEncapsulation(_current.encoding, format); // // We still return the stream even if no response is expected. The @@ -123,7 +123,7 @@ IncomingBase::__endWriteParams(bool ok) if(_response) { *(_os.b.begin() + headerSize + 4) = ok ? replyOK : replyUserException; // Reply status position. - _os.endWriteEncaps(); + _os.endEncapsulation(); } } @@ -135,7 +135,7 @@ IncomingBase::__writeEmptyParams() assert(_os.b.size() == headerSize + 4); // Reply status position. assert(_current.encoding >= Ice::Encoding_1_0); // Encoding for reply is known. _os.write(replyOK); - _os.writeEmptyEncaps(_current.encoding); + _os.writeEmptyEncapsulation(_current.encoding); } } @@ -154,11 +154,11 @@ IncomingBase::__writeParamEncaps(const Byte* v, Ice::Int sz, bool ok) _os.write(ok ? replyOK : replyUserException); if(sz == 0) { - _os.writeEmptyEncaps(_current.encoding); + _os.writeEmptyEncapsulation(_current.encoding); } else { - _os.writeEncaps(v, sz); + _os.writeEncapsulation(v, sz); } } } @@ -166,7 +166,7 @@ IncomingBase::__writeParamEncaps(const Byte* v, Ice::Int sz, bool ok) void IncomingBase::__writeUserException(const Ice::UserException& ex, Ice::FormatType format) { - ::IceInternal::BasicStream* __os = __startWriteParams(format); + ::Ice::OutputStream* __os = __startWriteParams(format); __os->write(ex); __endWriteParams(false); } @@ -235,9 +235,9 @@ IceInternal::IncomingBase::__servantLocatorFinished(bool amd) { _os.b.resize(headerSize + 4); // Reply status position. _os.write(replyUserException); - _os.startWriteEncaps(_current.encoding, DefaultFormat); + _os.startEncapsulation(_current.encoding, DefaultFormat); _os.write(ex); - _os.endWriteEncaps(); + _os.endEncapsulation(); _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4)); _responseHandler->sendResponse(_current.requestId, &_os, _compress, amd); } @@ -571,11 +571,11 @@ IceInternal::Incoming::setActive(IncomingAsync& cb) } void -IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStream* stream) +IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, InputStream* stream) { _is = stream; - BasicStream::Container::iterator start = _is->i; + InputStream::Container::iterator start = _is->i; // // Read the current. @@ -651,16 +651,16 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre } catch(const UserException& ex) { - Ice::EncodingVersion encoding = _is->skipEncaps(); // Required for batch requests. + Ice::EncodingVersion encoding = _is->skipEncapsulation(); // Required for batch requests. _observer.userException(); if(_response) { _os.write(replyUserException); - _os.startWriteEncaps(encoding, DefaultFormat); + _os.startEncapsulation(encoding, DefaultFormat); _os.write(ex); - _os.endWriteEncaps(); + _os.endEncapsulation(); _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4)); _responseHandler->sendResponse(_current.requestId, &_os, _compress, false); } @@ -675,13 +675,13 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre } catch(const std::exception& ex) { - _is->skipEncaps(); // Required for batch requests. + _is->skipEncapsulation(); // Required for batch requests. __handleException(ex, false); return; } catch(...) { - _is->skipEncaps(); // Required for batch requests. + _is->skipEncapsulation(); // Required for batch requests. __handleException(false); return; } @@ -713,7 +713,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre // Skip the input parameters, this is required for reading // the next batch request if dispatching batch requests. // - _is->skipEncaps(); + _is->skipEncapsulation(); if(servantManager && servantManager->hasServant(_current.id)) { diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index bdb3f4360ad..63d89b45182 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -13,7 +13,6 @@ #include <Ice/PropertiesI.h> #include <Ice/Initialize.h> #include <Ice/LocalException.h> -#include <Ice/StreamI.h> #include <Ice/LoggerI.h> #include <Ice/Instance.h> #include <Ice/PluginManagerI.h> @@ -262,85 +261,6 @@ Ice::initialize(const InitializationData& initData, Int version) return communicator; } -namespace -{ - -pair<const Byte*, const Byte*> -makePair(const vector<Byte>& v) -{ - if(v.empty()) - { - return pair<const Byte*, const Byte*>(static_cast<Byte*>(0), static_cast<Byte*>(0)); - } - else - { - return pair<const Byte*, const Byte*>(&v[0], &v[0] + v.size()); - } -} - -} -InputStreamPtr -Ice::createInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes) -{ - return new InputStreamI(communicator, makePair(bytes), true); -} - -InputStreamPtr -Ice::createInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes, const EncodingVersion& v) -{ - return new InputStreamI(communicator, makePair(bytes), v, true); -} - -InputStreamPtr -Ice::wrapInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes) -{ - return new InputStreamI(communicator, makePair(bytes), false); -} - -InputStreamPtr -Ice::wrapInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes, const EncodingVersion& v) -{ - return new InputStreamI(communicator, makePair(bytes), v, false); -} - -InputStreamPtr -Ice::createInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes) -{ - return new InputStreamI(communicator, bytes, true); -} - -InputStreamPtr -Ice::createInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes, - const EncodingVersion& v) -{ - return new InputStreamI(communicator, bytes, v, true); -} - -InputStreamPtr -Ice::wrapInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes) -{ - return new InputStreamI(communicator, bytes, false); -} - -InputStreamPtr -Ice::wrapInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes, - const EncodingVersion& v) -{ - return new InputStreamI(communicator, bytes, v, false); -} - -OutputStreamPtr -Ice::createOutputStream(const CommunicatorPtr& communicator) -{ - return new OutputStreamI(communicator); -} - -OutputStreamPtr -Ice::createOutputStream(const CommunicatorPtr& communicator, const EncodingVersion& v) -{ - return new OutputStreamI(communicator, v); -} - LoggerPtr Ice::getProcessLogger() { diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/InputStream.cpp index 7599b6b8223..535d26a5d96 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/InputStream.cpp @@ -8,14 +8,13 @@ // ********************************************************************** #include <IceUtil/DisableWarnings.h> -#include <Ice/BasicStream.h> +#include <Ice/InputStream.h> #include <Ice/DefaultsAndOverrides.h> #include <Ice/Instance.h> #include <Ice/Object.h> #include <Ice/Proxy.h> #include <Ice/ProxyFactory.h> #include <Ice/ValueFactory.h> -#include <Ice/ValueFactoryManager.h> #include <Ice/UserExceptionFactory.h> #include <Ice/LocalException.h> #include <Ice/Protocol.h> @@ -31,119 +30,170 @@ using namespace std; using namespace Ice; using namespace IceInternal; -namespace +Ice::InputStream::InputStream() { + initialize(currentEncoding); +} -class StreamUTF8BufferI : public IceUtil::UTF8Buffer +Ice::InputStream::InputStream(const vector<Byte>& v) : + Buffer(v) { -public: + initialize(currentEncoding); +} - StreamUTF8BufferI(BasicStream& stream) : - _stream(stream) - { - } +Ice::InputStream::InputStream(const pair<const Byte*, const Byte*>& p) : + Buffer(p.first, p.second) +{ + initialize(currentEncoding); +} - Ice::Byte* - getMoreBytes(size_t howMany, Ice::Byte* firstUnused) - { - assert(howMany > 0); +Ice::InputStream::InputStream(Buffer& buf, bool adopt) : + Buffer(buf, adopt) +{ + initialize(currentEncoding); +} - if(firstUnused != 0) - { - // - // Return unused bytes - // - _stream.resize(firstUnused - _stream.b.begin()); - } +Ice::InputStream::InputStream(const CommunicatorPtr& communicator) +{ + initialize(communicator); +} - // - // Index of first unused byte - // - Buffer::Container::size_type pos = _stream.b.size(); +Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const vector<Byte>& v) : + Buffer(v) +{ + initialize(communicator); +} - // - // Since resize may reallocate the buffer, when firstUnused != 0, the - // return value can be != firstUnused - // - _stream.resize(pos + howMany); +Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const pair<const Byte*, const Byte*>& p) : + Buffer(p.first, p.second) +{ + initialize(communicator); +} - return &_stream.b[pos]; - } +Ice::InputStream::InputStream(const CommunicatorPtr& communicator, Buffer& buf, bool adopt) : + Buffer(buf, adopt) +{ + initialize(communicator); +} + +Ice::InputStream::InputStream(const EncodingVersion& encoding) +{ + initialize(encoding); +} -private: +Ice::InputStream::InputStream(const EncodingVersion& encoding, const vector<Byte>& v) : + Buffer(v) +{ + initialize(encoding); +} - BasicStream& _stream; -}; +Ice::InputStream::InputStream(const EncodingVersion& encoding, const pair<const Byte*, const Byte*>& p) : + Buffer(p.first, p.second) +{ + initialize(encoding); +} -const Byte OPTIONAL_END_MARKER = 0xFF; +Ice::InputStream::InputStream(const EncodingVersion& encoding, Buffer& buf, bool adopt) : + Buffer(buf, adopt) +{ + initialize(encoding); +} -const Byte FLAG_HAS_TYPE_ID_STRING = (1<<0); -const Byte FLAG_HAS_TYPE_ID_INDEX = (1<<1); -const Byte FLAG_HAS_TYPE_ID_COMPACT = (1<<0) | (1<<1); -const Byte FLAG_HAS_OPTIONAL_MEMBERS = (1<<2); -const Byte FLAG_HAS_INDIRECTION_TABLE = (1<<3); -const Byte FLAG_HAS_SLICE_SIZE = (1<<4); -const Byte FLAG_IS_LAST_SLICE = (1<<5); +Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding) +{ + initialize(communicator, encoding); +} +Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding, + const vector<Byte>& v) : + Buffer(v) +{ + initialize(communicator, encoding); } +Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding, + const pair<const Byte*, const Byte*>& p) : + Buffer(p.first, p.second) +{ + initialize(communicator, encoding); +} -IceInternal::BasicStream::BasicStream(Instance* instance, const EncodingVersion& encoding) : - _instance(instance), - _closure(0), - _encoding(encoding), - _currentReadEncaps(0), - _currentWriteEncaps(0), - _sliceObjects(true), - _stringConverter(instance->getStringConverter()), - _wstringConverter(instance->getWstringConverter()), - _startSeq(-1), - _minSeqSize(0) +Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding, + Buffer& buf, bool adopt) : + Buffer(buf, adopt) { - // - // Initialize the encoding members of our pre-allocated encapsulations, in case - // this stream is used without an explicit encapsulation. - // - _preAllocatedReadEncaps.encoding = encoding; - _preAllocatedWriteEncaps.encoding = encoding; + initialize(communicator, encoding); +} + +Ice::InputStream::InputStream(Instance* instance, const EncodingVersion& encoding) +{ + initialize(instance, encoding); +} + +Ice::InputStream::InputStream(Instance* instance, const EncodingVersion& encoding, Buffer& buf, bool adopt) : + Buffer(buf, adopt) +{ + initialize(instance, encoding); } -IceInternal::BasicStream::BasicStream(Instance* instance, const EncodingVersion& encoding, const Byte* begin, - const Byte* end) : - IceInternal::Buffer(begin, end), - _instance(instance), - _closure(0), - _encoding(encoding), - _currentReadEncaps(0), - _currentWriteEncaps(0), - _sliceObjects(true), - _stringConverter(instance->getStringConverter()), - _wstringConverter(instance->getWstringConverter()), - _startSeq(-1), - _minSeqSize(0) +void +Ice::InputStream::initialize(const CommunicatorPtr& communicator) { + Instance* instance = getInstance(communicator).get(); + initialize(instance, instance->defaultsAndOverrides()->defaultEncoding); +} + +void +Ice::InputStream::initialize(const CommunicatorPtr& communicator, const EncodingVersion& encoding) +{ + initialize(getInstance(communicator).get(), encoding); +} + +void +Ice::InputStream::initialize(Instance* instance, const EncodingVersion& encoding) +{ + initialize(encoding); + + _instance = instance; + + _stringConverter = _instance->getStringConverter(); + _wstringConverter = _instance->getWstringConverter(); + +#ifndef ICE_CPP11_MAPPING + _collectObjects = _instance->collectObjects(); +#endif + _traceSlicing = _instance->traceLevels()->slicing > 0; +} + +void +Ice::InputStream::initialize(const EncodingVersion& encoding) +{ + _instance = 0; + _encoding = encoding; + _currentEncaps = 0; +#ifndef ICE_CPP11_MAPPING + _collectObjects = false; +#endif + _traceSlicing = false; + _closure = 0; + _sliceObjects = true; + _startSeq = -1; + _minSeqSize = 0; + // - // Initialize the encoding members of our pre-allocated encapsulations, in case + // Initialize the encoding members of our pre-allocated encapsulation, in case // this stream is used without an explicit encapsulation. // - _preAllocatedReadEncaps.encoding = encoding; - _preAllocatedWriteEncaps.encoding = encoding; + _preAllocatedEncaps.encoding = encoding; } void -IceInternal::BasicStream::clear() +Ice::InputStream::clear() { - while(_currentReadEncaps && _currentReadEncaps != &_preAllocatedReadEncaps) + while(_currentEncaps && _currentEncaps != &_preAllocatedEncaps) { - ReadEncaps* oldEncaps = _currentReadEncaps; - _currentReadEncaps = _currentReadEncaps->previous; - delete oldEncaps; - } - - while(_currentWriteEncaps && _currentWriteEncaps != &_preAllocatedWriteEncaps) - { - WriteEncaps* oldEncaps = _currentWriteEncaps; - _currentWriteEncaps = _currentWriteEncaps->previous; + Encaps* oldEncaps = _currentEncaps; + _currentEncaps = _currentEncaps->previous; delete oldEncaps; } @@ -151,14 +201,63 @@ IceInternal::BasicStream::clear() _sliceObjects = true; } +void +Ice::InputStream::setStringConverters(const IceUtil::StringConverterPtr& sc, const IceUtil::WstringConverterPtr& wsc) +{ + _stringConverter = sc; + _wstringConverter = wsc; +} + +void +Ice::InputStream::setValueFactoryManager(const ValueFactoryManagerPtr& vfm) +{ + _valueFactoryManager = vfm; +} + +void +Ice::InputStream::setLogger(const LoggerPtr& logger) +{ + _logger = logger; +} + +void +#ifdef ICE_CPP11_MAPPING +Ice::InputStream::setCompactIdResolver(std::function<std::string (int)> r) +#else +Ice::InputStream::setCompactIdResolver(const CompactIdResolverPtr& r) +#endif +{ + _compactIdResolver = r; +} + +#ifndef ICE_CPP11_MAPPING +void +Ice::InputStream::setCollectObjects(bool b) +{ + _collectObjects = b; +} +#endif + +void +Ice::InputStream::setSliceObjects(bool b) +{ + _sliceObjects = b; +} + +void +Ice::InputStream::setTraceSlicing(bool b) +{ + _traceSlicing = b; +} + void* -IceInternal::BasicStream::closure() const +Ice::InputStream::getClosure() const { return _closure; } void* -IceInternal::BasicStream::closure(void* p) +Ice::InputStream::setClosure(void* p) { void* prev = _closure; _closure = p; @@ -166,95 +265,64 @@ IceInternal::BasicStream::closure(void* p) } void -IceInternal::BasicStream::swap(BasicStream& other) +Ice::InputStream::swap(InputStream& other) { assert(_instance == other._instance); swapBuffer(other); + std::swap(_encoding, other._encoding); + +#ifndef ICE_CPP11_MAPPING + std::swap(_collectObjects, other._collectObjects); +#endif + + std::swap(_traceSlicing, other._traceSlicing); + std::swap(_closure, other._closure); + std::swap(_sliceObjects, other._sliceObjects); + // - // Swap is never called for BasicStreams that have encapsulations being read/write. However, - // encapsulations might still be set in case marhsalling or un-marhsalling failed. We just + // Swap is never called for streams that have encapsulations being read. However, + // encapsulations might still be set in case unmarshaling failed. We just // reset the encapsulations if there are still some set. // - resetEncaps(); - other.resetEncaps(); + resetEncapsulation(); + other.resetEncapsulation(); std::swap(_startSeq, other._startSeq); std::swap(_minSeqSize, other._minSeqSize); -} -void -IceInternal::BasicStream::resetEncaps() -{ - while(_currentReadEncaps && _currentReadEncaps != &_preAllocatedReadEncaps) - { - ReadEncaps* oldEncaps = _currentReadEncaps; - _currentReadEncaps = _currentReadEncaps->previous; - delete oldEncaps; - } - - while(_currentWriteEncaps && _currentWriteEncaps != &_preAllocatedWriteEncaps) - { - WriteEncaps* oldEncaps = _currentWriteEncaps; - _currentWriteEncaps = _currentWriteEncaps->previous; - delete oldEncaps; - } - - _preAllocatedReadEncaps.reset(); - _preAllocatedWriteEncaps.reset(); + std::swap(_stringConverter, other._stringConverter); + std::swap(_wstringConverter, other._wstringConverter); + std::swap(_valueFactoryManager, other._valueFactoryManager); + std::swap(_logger, other._logger); + std::swap(_compactIdResolver, other._compactIdResolver); } void -IceInternal::BasicStream::startWriteEncaps() +Ice::InputStream::resetEncapsulation() { - // - // If no encoding version is specified, use the current write - // encapsulation encoding version if there's a current write - // encapsulation, otherwise, use the stream encoding version. - // - - if(_currentWriteEncaps) - { - startWriteEncaps(_currentWriteEncaps->encoding, _currentWriteEncaps->format); - } - else - { - startWriteEncaps(_encoding, Ice::DefaultFormat); - } -} - -void -IceInternal::BasicStream::endWriteEncapsChecked() -{ - if(!_currentWriteEncaps) + while(_currentEncaps && _currentEncaps != &_preAllocatedEncaps) { - throw EncapsulationException(__FILE__, __LINE__, "not in an encapsulation"); + Encaps* oldEncaps = _currentEncaps; + _currentEncaps = _currentEncaps->previous; + delete oldEncaps; } - endWriteEncaps(); -} -void -IceInternal::BasicStream::endReadEncapsChecked() -{ - if(!_currentReadEncaps) - { - throw EncapsulationException(__FILE__, __LINE__, "not in an encapsulation"); - } - endReadEncaps(); + _preAllocatedEncaps.reset(); } Int -IceInternal::BasicStream::getReadEncapsSize() +Ice::InputStream::getEncapsSize() { - assert(_currentReadEncaps); - return _currentReadEncaps->sz - static_cast<Int>(sizeof(Int)) - 2; + assert(_currentEncaps); + return _currentEncaps->sz - static_cast<Int>(sizeof(Int)) - 2; } EncodingVersion -IceInternal::BasicStream::skipEncaps() +Ice::InputStream::skipEncapsulation() { Int sz; read(sz); @@ -274,13 +342,13 @@ IceInternal::BasicStream::skipEncaps() } void -IceInternal::BasicStream::readPendingObjects() +Ice::InputStream::readPendingObjects() { - if(_currentReadEncaps && _currentReadEncaps->decoder) + if(_currentEncaps && _currentEncaps->decoder) { - _currentReadEncaps->decoder->readPendingObjects(); + _currentEncaps->decoder->readPendingObjects(); } - else if(getReadEncoding() == Ice::Encoding_1_0) + else if(getEncoding() == Ice::Encoding_1_0) { // // If using the 1.0 encoding and no objects were read, we @@ -295,30 +363,8 @@ IceInternal::BasicStream::readPendingObjects() } } -void -IceInternal::BasicStream::writePendingObjects() -{ - if(_currentWriteEncaps && _currentWriteEncaps->encoder) - { - _currentWriteEncaps->encoder->writePendingObjects(); - } - else if(getWriteEncoding() == Ice::Encoding_1_0) - { - // - // If using the 1.0 encoding and no objects were written, we - // still write an empty sequence for pending objects if - // requested (i.e.: if this is called). - // - // This is required by the 1.0 encoding, even if no objects - // are written we do marshal an empty sequence if marshaled - // data types use classes. - // - writeSize(0); - } -} - Int -IceInternal::BasicStream::readAndCheckSeqSize(int minSize) +Ice::InputStream::readAndCheckSeqSize(int minSize) { Int sz = readSize(); @@ -368,18 +414,7 @@ IceInternal::BasicStream::readAndCheckSeqSize(int minSize) } void -IceInternal::BasicStream::writeBlob(const vector<Byte>& v) -{ - if(!v.empty()) - { - Container::size_type pos = b.size(); - resize(pos + v.size()); - memcpy(&b[pos], &v[0], v.size()); - } -} - -void -IceInternal::BasicStream::readBlob(vector<Byte>& v, Int sz) +Ice::InputStream::readBlob(vector<Byte>& v, Int sz) { if(sz > 0) { @@ -397,20 +432,7 @@ IceInternal::BasicStream::readBlob(vector<Byte>& v, Int sz) } void -IceInternal::BasicStream::write(const Byte* begin, const Byte* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz); - memcpy(&b[pos], begin, sz); - } -} - -void -IceInternal::BasicStream::read(std::vector<Ice::Byte>& v) +Ice::InputStream::read(std::vector<Ice::Byte>& v) { std::pair<const Ice::Byte*, const Ice::Byte*> p; read(p); @@ -426,7 +448,7 @@ IceInternal::BasicStream::read(std::vector<Ice::Byte>& v) } void -IceInternal::BasicStream::read(pair<const Byte*, const Byte*>& v) +Ice::InputStream::read(pair<const Byte*, const Byte*>& v) { Int sz = readAndCheckSeqSize(1); if(sz > 0) @@ -442,59 +464,7 @@ IceInternal::BasicStream::read(pair<const Byte*, const Byte*>& v) } void -IceInternal::BasicStream::write(const vector<bool>& v) -{ - Int sz = static_cast<Int>(v.size()); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz); - copy(v.begin(), v.end(), b.begin() + pos); - } -} - -namespace -{ - -template<size_t boolSize> -struct BasicStreamWriteBoolHelper -{ - static void write(const bool* begin, BasicStream::Container::size_type pos, BasicStream::Container& b, Int sz) - { - for(int idx = 0; idx < sz; ++idx) - { - b[pos + idx] = static_cast<Byte>(*(begin + idx)); - } - } -}; - -template<> -struct BasicStreamWriteBoolHelper<1> -{ - static void write(const bool* begin, BasicStream::Container::size_type pos, BasicStream::Container& b, Int sz) - { - memcpy(&b[pos], begin, sz); - } -}; - -} - -void -IceInternal::BasicStream::write(const bool* begin, const bool* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz); - BasicStreamWriteBoolHelper<sizeof(bool)>::write(begin, pos, b, sz); - } -} - -void -IceInternal::BasicStream::read(vector<bool>& v) +Ice::InputStream::read(vector<bool>& v) { Int sz = readAndCheckSeqSize(1); if(sz > 0) @@ -513,9 +483,9 @@ namespace { template<size_t boolSize> -struct BasicStreamReadBoolHelper +struct ReadBoolHelper { - static bool* read(pair<const bool*, const bool*>& v, Int sz, BasicStream::Container::iterator& i) + static bool* read(pair<const bool*, const bool*>& v, Int sz, InputStream::Container::iterator& i) { bool* array = new bool[sz]; for(int idx = 0; idx < sz; ++idx) @@ -529,9 +499,9 @@ struct BasicStreamReadBoolHelper }; template<> -struct BasicStreamReadBoolHelper<1> +struct ReadBoolHelper<1> { - static bool* read(pair<const bool*, const bool*>& v, Int sz, BasicStream::Container::iterator& i) + static bool* read(pair<const bool*, const bool*>& v, Int sz, InputStream::Container::iterator& i) { v.first = reinterpret_cast<bool*>(i); v.second = reinterpret_cast<bool*>(i) + sz; @@ -542,12 +512,12 @@ struct BasicStreamReadBoolHelper<1> } void -IceInternal::BasicStream::read(pair<const bool*, const bool*>& v, IceUtil::ScopedArray<bool>& result) +Ice::InputStream::read(pair<const bool*, const bool*>& v, IceUtil::ScopedArray<bool>& result) { Int sz = readAndCheckSeqSize(1); if(sz > 0) { - result.reset(BasicStreamReadBoolHelper<sizeof(bool)>::read(v, sz, i)); + result.reset(ReadBoolHelper<sizeof(bool)>::read(v, sz, i)); i += sz; } else @@ -558,48 +528,7 @@ IceInternal::BasicStream::read(pair<const bool*, const bool*>& v, IceUtil::Scope } void -IceInternal::BasicStream::write(Short v) -{ - Container::size_type pos = b.size(); - resize(pos + sizeof(Short)); - Byte* dest = &b[pos]; -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Short) - 1; - *dest++ = *src--; - *dest = *src; -#else - const Byte* src = reinterpret_cast<const Byte*>(&v); - *dest++ = *src++; - *dest = *src; -#endif -} - -void -IceInternal::BasicStream::write(const Short* begin, const Short* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz * sizeof(Short)); -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Short) - 1; - Byte* dest = &(*(b.begin() + pos)); - for(int j = 0 ; j < sz ; ++j) - { - *dest++ = *src--; - *dest++ = *src--; - src += 2 * sizeof(Short); - } -#else - memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Short)); -#endif - } -} - -void -IceInternal::BasicStream::read(Short& v) +Ice::InputStream::read(Short& v) { if(b.end() - i < static_cast<int>(sizeof(Short))) { @@ -619,7 +548,7 @@ IceInternal::BasicStream::read(Short& v) } void -IceInternal::BasicStream::read(vector<Short>& v) +Ice::InputStream::read(vector<Short>& v) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Short))); if(sz > 0) @@ -647,7 +576,7 @@ IceInternal::BasicStream::read(vector<Short>& v) } void -IceInternal::BasicStream::read(pair<const Short*, const Short*>& v, IceUtil::ScopedArray<Short>& result) +Ice::InputStream::read(pair<const Short*, const Short*>& v, IceUtil::ScopedArray<Short>& result) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Short))); if(sz > 0) @@ -685,33 +614,7 @@ IceInternal::BasicStream::read(pair<const Short*, const Short*>& v, IceUtil::Sco } void -IceInternal::BasicStream::write(const Int* begin, const Int* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz * sizeof(Int)); -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Int) - 1; - Byte* dest = &(*(b.begin() + pos)); - for(int j = 0 ; j < sz ; ++j) - { - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - src += 2 * sizeof(Int); - } -#else - memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Int)); -#endif - } -} - -void -IceInternal::BasicStream::read(vector<Int>& v) +Ice::InputStream::read(vector<Int>& v) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Int))); if(sz > 0) @@ -741,7 +644,7 @@ IceInternal::BasicStream::read(vector<Int>& v) } void -IceInternal::BasicStream::read(pair<const Int*, const Int*>& v, ::IceUtil::ScopedArray<Int>& result) +Ice::InputStream::read(pair<const Int*, const Int*>& v, ::IceUtil::ScopedArray<Int>& result) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Int))); if(sz > 0) @@ -781,66 +684,7 @@ IceInternal::BasicStream::read(pair<const Int*, const Int*>& v, ::IceUtil::Scope } void -IceInternal::BasicStream::write(Long v) -{ - Container::size_type pos = b.size(); - resize(pos + sizeof(Long)); - Byte* dest = &b[pos]; -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Long) - 1; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest = *src; -#else - const Byte* src = reinterpret_cast<const Byte*>(&v); - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest = *src; -#endif -} - -void -IceInternal::BasicStream::write(const Long* begin, const Long* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz * sizeof(Long)); -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Long) - 1; - Byte* dest = &(*(b.begin() + pos)); - for(int j = 0 ; j < sz ; ++j) - { - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - src += 2 * sizeof(Long); - } -#else - memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Long)); -#endif - } -} - -void -IceInternal::BasicStream::read(Long& v) +Ice::InputStream::read(Long& v) { if(b.end() - i < static_cast<int>(sizeof(Long))) { @@ -872,7 +716,7 @@ IceInternal::BasicStream::read(Long& v) } void -IceInternal::BasicStream::read(vector<Long>& v) +Ice::InputStream::read(vector<Long>& v) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Long))); if(sz > 0) @@ -906,7 +750,7 @@ IceInternal::BasicStream::read(vector<Long>& v) } void -IceInternal::BasicStream::read(pair<const Long*, const Long*>& v, IceUtil::ScopedArray<Long>& result) +Ice::InputStream::read(pair<const Long*, const Long*>& v, IceUtil::ScopedArray<Long>& result) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Long))); if(sz > 0) @@ -950,54 +794,7 @@ IceInternal::BasicStream::read(pair<const Long*, const Long*>& v, IceUtil::Scope } void -IceInternal::BasicStream::write(Float v) -{ - Container::size_type pos = b.size(); - resize(pos + sizeof(Float)); - Byte* dest = &b[pos]; -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Float) - 1; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest = *src; -#else - const Byte* src = reinterpret_cast<const Byte*>(&v); - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest = *src; -#endif -} - -void -IceInternal::BasicStream::write(const Float* begin, const Float* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz * sizeof(Float)); -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Float) - 1; - Byte* dest = &(*(b.begin() + pos)); - for(int j = 0 ; j < sz ; ++j) - { - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - src += 2 * sizeof(Float); - } -#else - memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Float)); -#endif - } -} - -void -IceInternal::BasicStream::read(Float& v) +Ice::InputStream::read(Float& v) { if(b.end() - i < static_cast<int>(sizeof(Float))) { @@ -1021,7 +818,7 @@ IceInternal::BasicStream::read(Float& v) } void -IceInternal::BasicStream::read(vector<Float>& v) +Ice::InputStream::read(vector<Float>& v) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Float))); if(sz > 0) @@ -1051,7 +848,7 @@ IceInternal::BasicStream::read(vector<Float>& v) } void -IceInternal::BasicStream::read(pair<const Float*, const Float*>& v, IceUtil::ScopedArray<Float>& result) +Ice::InputStream::read(pair<const Float*, const Float*>& v, IceUtil::ScopedArray<Float>& result) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Float))); if(sz > 0) @@ -1091,92 +888,7 @@ IceInternal::BasicStream::read(pair<const Float*, const Float*>& v, IceUtil::Sco } void -IceInternal::BasicStream::write(Double v) -{ - Container::size_type pos = b.size(); - resize(pos + sizeof(Double)); - Byte* dest = &b[pos]; -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Double) - 1; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest = *src; -#else - const Byte* src = reinterpret_cast<const Byte*>(&v); -# if defined(ICE_LITTLEBYTE_BIGWORD) - dest[4] = *src++; - dest[5] = *src++; - dest[6] = *src++; - dest[7] = *src++; - dest[0] = *src++; - dest[1] = *src++; - dest[2] = *src++; - dest[3] = *src; -# else - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest = *src; -# endif -#endif -} - -void -IceInternal::BasicStream::write(const Double* begin, const Double* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz * sizeof(Double)); -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Double) - 1; - Byte* dest = &(*(b.begin() + pos)); - for(int j = 0 ; j < sz ; ++j) - { - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - src += 2 * sizeof(Double); - } -#elif defined(ICE_LITTLEBYTE_BIGWORD) - const Byte* src = reinterpret_cast<const Byte*>(begin); - Byte* dest = &(*(b.begin() + pos)); - for(int j = 0 ; j < sz ; ++j) - { - dest[4] = *src++; - dest[5] = *src++; - dest[6] = *src++; - dest[7] = *src++; - dest[0] = *src++; - dest[1] = *src++; - dest[2] = *src++; - dest[3] = *src++; - dest += sizeof(Double); - } -#else - memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Double)); -#endif - } -} - -void -IceInternal::BasicStream::read(Double& v) +Ice::InputStream::read(Double& v) { if(b.end() - i < static_cast<int>(sizeof(Double))) { @@ -1219,7 +931,7 @@ IceInternal::BasicStream::read(Double& v) } void -IceInternal::BasicStream::read(vector<Double>& v) +Ice::InputStream::read(vector<Double>& v) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Double))); if(sz > 0) @@ -1268,7 +980,7 @@ IceInternal::BasicStream::read(vector<Double>& v) } void -IceInternal::BasicStream::read(pair<const Double*, const Double*>& v, IceUtil::ScopedArray<Double>& result) +Ice::InputStream::read(pair<const Double*, const Double*>& v, IceUtil::ScopedArray<Double>& result) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Double))); if(sz > 0) @@ -1327,101 +1039,14 @@ IceInternal::BasicStream::read(pair<const Double*, const Double*>& v, IceUtil::S } } -// -// NOTE: This member function is intentionally omitted in order to -// cause a link error if it is used. This is for efficiency reasons: -// writing a const char * requires a traversal of the string to get -// the string length first, which takes O(n) time, whereas getting the -// string length from a std::string takes constant time. -// -/* -void -IceInternal::BasicStream::write(const char*) -{ -} -*/ - -void -IceInternal::BasicStream::writeConverted(const char* vdata, size_t vsize) -{ - // - // What is the size of the resulting UTF-8 encoded string? - // Impossible to tell, so we guess. If we don't guess correctly, - // we'll have to fix the mistake afterwards - // - try - { - Int guessedSize = static_cast<Int>(vsize); - writeSize(guessedSize); // writeSize() only writes the size; it does not reserve any buffer space. - - size_t firstIndex = b.size(); - StreamUTF8BufferI buffer(*this); - - Byte* lastByte = _stringConverter->toUTF8(vdata, vdata + vsize, buffer); - if(lastByte != b.end()) - { - resize(lastByte - b.begin()); - } - size_t lastIndex = b.size(); - - Int actualSize = static_cast<Int>(lastIndex - firstIndex); - - // - // Check against the guess - // - if(guessedSize != actualSize) - { - if(guessedSize <= 254 && actualSize > 254) - { - // - // Move the UTF-8 sequence 4 bytes further - // Use memmove instead of memcpy since the source and destination typically overlap. - // - resize(b.size() + 4); - memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize); - } - else if(guessedSize > 254 && actualSize <= 254) - { - // - // Move the UTF-8 sequence 4 bytes back - // - memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize); - resize(b.size() - 4); - } - - if(guessedSize <= 254) - { - rewriteSize(actualSize, b.begin() + firstIndex - 1); - } - else - { - rewriteSize(actualSize, b.begin() + firstIndex - 1 - 4); - } - } - } - catch(const IceUtil::IllegalConversionException& ex) - { - throw StringConversionException(__FILE__, __LINE__, ex.reason()); - } -} - void -IceInternal::BasicStream::write(const string* begin, const string* end, bool convert) +Ice::InputStream::readConverted(string& v, int sz) { - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) + if(!_stringConverter) { - for(int i = 0; i < sz; ++i) - { - write(begin[i], convert); - } + throw MarshalException(__FILE__, __LINE__, "no string converter provided"); } -} -void -IceInternal::BasicStream::readConverted(string& v, int sz) -{ try { _stringConverter->fromUTF8(i, i + sz, v); @@ -1433,7 +1058,7 @@ IceInternal::BasicStream::readConverted(string& v, int sz) } void -IceInternal::BasicStream::read(vector<string>& v, bool convert) +Ice::InputStream::read(vector<string>& v, bool convert) { Int sz = readAndCheckSeqSize(1); if(sz > 0) @@ -1451,92 +1076,13 @@ IceInternal::BasicStream::read(vector<string>& v, bool convert) } void -IceInternal::BasicStream::write(const wstring& v) +Ice::InputStream::read(wstring& v) { - if(v.empty()) + if(!_wstringConverter) { - writeSize(0); - return; + throw MarshalException(__FILE__, __LINE__, "no wstring converter provided"); } - // - // What is the size of the resulting UTF-8 encoded string? - // Impossible to tell, so we guess. If we don't guess correctly, - // we'll have to fix the mistake afterwards - // - try - { - Int guessedSize = static_cast<Int>(v.size()); - writeSize(guessedSize); // writeSize() only writes the size; it does not reserve any buffer space. - - size_t firstIndex = b.size(); - StreamUTF8BufferI buffer(*this); - - Byte* lastByte = _wstringConverter->toUTF8(v.data(), v.data() + v.size(), buffer); - if(lastByte != b.end()) - { - resize(lastByte - b.begin()); - } - size_t lastIndex = b.size(); - - Int actualSize = static_cast<Int>(lastIndex - firstIndex); - - // - // Check against the guess - // - if(guessedSize != actualSize) - { - if(guessedSize <= 254 && actualSize > 254) - { - // - // Move the UTF-8 sequence 4 bytes further - // Use memmove instead of memcpy since the source and destination typically overlap. - // - resize(b.size() + 4); - memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize); - } - else if(guessedSize > 254 && actualSize <= 254) - { - // - // Move the UTF-8 sequence 4 bytes back - // - memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize); - resize(b.size() - 4); - } - - if(guessedSize <= 254) - { - rewriteSize(actualSize, b.begin() + firstIndex - 1); - } - else - { - rewriteSize(actualSize, b.begin() + firstIndex - 1 - 4); - } - } - } - catch(const IceUtil::IllegalConversionException& ex) - { - throw StringConversionException(__FILE__, __LINE__, ex.reason()); - } -} - -void -IceInternal::BasicStream::write(const wstring* begin, const wstring* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - for(int i = 0; i < sz; ++i) - { - write(begin[i]); - } - } -} - -void -IceInternal::BasicStream::read(wstring& v) -{ Int sz = readSize(); if(sz > 0) { @@ -1562,7 +1108,7 @@ IceInternal::BasicStream::read(wstring& v) } void -IceInternal::BasicStream::read(vector<wstring>& v) +Ice::InputStream::read(vector<wstring>& v) { Int sz = readAndCheckSeqSize(1); if(sz > 0) @@ -1579,34 +1125,34 @@ IceInternal::BasicStream::read(vector<wstring>& v) } } -void -#ifdef ICE_CPP11_MAPPING -IceInternal::BasicStream::writeProxy(const shared_ptr<ObjectPrx>& v) -#else -IceInternal::BasicStream::write(const ObjectPrx& v) -#endif -{ - _instance->proxyFactory()->proxyToStream(v, this); -} - #ifdef ICE_CPP11_MAPPING shared_ptr<ObjectPrx> -IceInternal::BasicStream::readProxy() +Ice::InputStream::readProxy() { + if(!_instance) + { + throw MarshalException(__FILE__, __LINE__, "cannot unmarshal a proxy without a communicator"); + } + return _instance->proxyFactory()->streamToProxy(this); } #else void -IceInternal::BasicStream::read(ObjectPrx& v) +Ice::InputStream::read(ObjectPrx& v) { + if(!_instance) + { + throw MarshalException(__FILE__, __LINE__, "cannot unmarshal a proxy without a communicator"); + } + v = _instance->proxyFactory()->streamToProxy(this); } #endif Int -IceInternal::BasicStream::readEnum(Int maxValue) +Ice::InputStream::readEnum(Int maxValue) { - if(getReadEncoding() == Encoding_1_0) + if(getEncoding() == Encoding_1_0) { if(maxValue < 127) { @@ -1634,60 +1180,23 @@ IceInternal::BasicStream::readEnum(Int maxValue) } void -IceInternal::BasicStream::writeEnum(Int v, Int maxValue) +Ice::InputStream::throwException(const UserExceptionFactoryPtr& factory) { - if(getWriteEncoding() == Encoding_1_0) - { - if(maxValue < 127) - { - write(static_cast<Byte>(v)); - } - else if(maxValue < 32767) - { - write(static_cast<Short>(v)); - } - else - { - write(v); - } - } - else - { - writeSize(v); - } -} - -void -IceInternal::BasicStream::writeException(const UserException& e) -{ - initWriteEncaps(); - _currentWriteEncaps->encoder->write(e); -} - -void -IceInternal::BasicStream::throwException(const UserExceptionFactoryPtr& factory) -{ - initReadEncaps(); - _currentReadEncaps->decoder->throwException(factory); -} - -void -IceInternal::BasicStream::sliceObjects(bool doSlice) -{ - _sliceObjects = doSlice; + initEncaps(); + _currentEncaps->decoder->throwException(factory); } bool -IceInternal::BasicStream::readOptImpl(Int readTag, OptionalFormat expectedFormat) +Ice::InputStream::readOptImpl(Int readTag, OptionalFormat expectedFormat) { - if(getReadEncoding() == Encoding_1_0) + if(getEncoding() == Encoding_1_0) { return false; // Optional members aren't supported with the 1.0 encoding. } while(true) { - if(i >= b.begin() + _currentReadEncaps->start + _currentReadEncaps->sz) + if(i >= b.begin() + _currentEncaps->start + _currentEncaps->sz) { return false; // End of encapsulation also indicates end of optionals. } @@ -1730,31 +1239,8 @@ IceInternal::BasicStream::readOptImpl(Int readTag, OptionalFormat expectedFormat return true; // Keep the compiler happy. } -bool -IceInternal::BasicStream::writeOptImpl(Int tag, OptionalFormat type) -{ - if(getWriteEncoding() == Encoding_1_0) - { - return false; // Optional members aren't supported with the 1.0 encoding. - } - - Byte v = static_cast<Byte>(type); - if(tag < 30) - { - v |= static_cast<Byte>(tag << 3); - write(v); - } - else - { - v |= 0xF0; // tag = 30 - write(v); - writeSize(tag); - } - return true; -} - void -IceInternal::BasicStream::skipOpt(OptionalFormat type) +Ice::InputStream::skipOpt(OptionalFormat type) { switch(type) { @@ -1804,14 +1290,14 @@ IceInternal::BasicStream::skipOpt(OptionalFormat type) } void -BasicStream::skipOpts() +Ice::InputStream::skipOpts() { // // Skip remaining un-read optional members. // while(true) { - if(i >= b.begin() + _currentReadEncaps->start + _currentReadEncaps->sz) + if(i >= b.begin() + _currentEncaps->start + _currentEncaps->sz) { return; // End of encapsulation also indicates end of optionals. } @@ -1833,74 +1319,197 @@ BasicStream::skipOpts() } void -IceInternal::BasicStream::throwUnmarshalOutOfBoundsException(const char* file, int line) +Ice::InputStream::throwUnmarshalOutOfBoundsException(const char* file, int line) { throw UnmarshalOutOfBoundsException(file, line); } void -IceInternal::BasicStream::throwEncapsulationException(const char* file, int line) +Ice::InputStream::throwEncapsulationException(const char* file, int line) { throw EncapsulationException(file, line); } -void -IceInternal::BasicStream::initReadEncaps() +string +Ice::InputStream::resolveCompactId(int id) const { - if(!_currentReadEncaps) // Lazy initialization. + string type; + +#ifdef ICE_CPP11_MAPPING + function<string (int)> resolver = compactIdResolver(); +#else + CompactIdResolverPtr resolver = compactIdResolver(); +#endif + + if(resolver) { - _currentReadEncaps = &_preAllocatedReadEncaps; - _currentReadEncaps->sz = static_cast<Ice::Int>(b.size()); + try + { +#ifdef ICE_CPP11_MAPPING + type = resolver(id); +#else + type = resolver->resolve(id); +#endif + } + catch(const LocalException&) + { + throw; + } + catch(const std::exception& ex) + { + ostringstream ostr; + ostr << "exception in CompactIdResolver for ID " << id; + string msg = ostr.str(); + string what = ex.what(); + if(!what.empty()) + { + msg += ":\n" + what; + } + throw MarshalException(__FILE__, __LINE__, msg); + } + catch(...) + { + ostringstream ostr; + ostr << "unknown exception in CompactIdResolver for ID " << id; + throw MarshalException(__FILE__, __LINE__, ostr.str()); + } } - if(!_currentReadEncaps->decoder) // Lazy initialization. + return type; +} + +void +Ice::InputStream::postUnmarshal(const ValuePtr& v) const +{ + try { - ValueFactoryManagerPtr factoryManager = _instance->servantFactoryManager(); - if(_currentReadEncaps->encoding == Encoding_1_0) +#ifndef ICE_CPP11_MAPPING + if(_collectObjects) { - _currentReadEncaps->decoder = new EncapsDecoder10(this, _currentReadEncaps, _sliceObjects, factoryManager); + v->ice_collectable(true); } - else +#endif + v->ice_postUnmarshal(); + } + catch(const std::exception& ex) + { + if(logger()) { - _currentReadEncaps->decoder = new EncapsDecoder11(this, _currentReadEncaps, _sliceObjects, factoryManager); + Warning out(logger()); + out << "std::exception raised by ice_postUnmarshal:\n" << ex; + } + } + catch(...) + { + if(logger()) + { + Warning out(logger()); + out << "unknown exception raised by ice_postUnmarshal"; } } } void -IceInternal::BasicStream::initWriteEncaps() +Ice::InputStream::traceSkipSlice(const string& typeId, SliceType sliceType) const { - if(!_currentWriteEncaps) // Lazy initialization. + if(_traceSlicing && logger()) { - _currentWriteEncaps = &_preAllocatedWriteEncaps; - _currentWriteEncaps->start = b.size(); + traceSlicing(sliceType == ExceptionSlice ? "exception" : "object", typeId, "Slicing", logger()); } +} - if(_currentWriteEncaps->format == Ice::DefaultFormat) +ValueFactoryManagerPtr +Ice::InputStream::valueFactoryManager() const +{ + if(_valueFactoryManager) + { + return _valueFactoryManager; + } + else if(_instance) { - _currentWriteEncaps->format = _instance->defaultsAndOverrides()->defaultFormat; + return _instance->initializationData().valueFactoryManager; } - if(!_currentWriteEncaps->encoder) // Lazy initialization. + return 0; +} + +LoggerPtr +Ice::InputStream::logger() const +{ + if(_logger) + { + return _logger; + } + else if(_instance) { - if(_currentWriteEncaps->encoding == Encoding_1_0) + return _instance->initializationData().logger; + } + + return 0; +} + +#ifdef ICE_CPP11_MAPPING +function<string (int)> +Ice::InputStream::compactIdResolver() const +{ + if(_compactIdResolver) + { + return _compactIdResolver; + } + else if(_instance) + { + return _instance->initializationData().compactIdResolver; + } + + return nullptr; +} +#else +CompactIdResolverPtr +Ice::InputStream::compactIdResolver() const +{ + if(_compactIdResolver) + { + return _compactIdResolver; + } + else if(_instance) + { + return _instance->initializationData().compactIdResolver; + } + + return 0; +} +#endif + +void +Ice::InputStream::initEncaps() +{ + if(!_currentEncaps) // Lazy initialization. + { + _currentEncaps = &_preAllocatedEncaps; + _currentEncaps->sz = static_cast<Ice::Int>(b.size()); + } + + if(!_currentEncaps->decoder) // Lazy initialization. + { + ValueFactoryManagerPtr vfm = valueFactoryManager(); + if(_currentEncaps->encoding == Encoding_1_0) { - _currentWriteEncaps->encoder = new EncapsEncoder10(this, _currentWriteEncaps); + _currentEncaps->decoder = new EncapsDecoder10(this, _currentEncaps, _sliceObjects, vfm); } else { - _currentWriteEncaps->encoder = new EncapsEncoder11(this, _currentWriteEncaps); + _currentEncaps->decoder = new EncapsDecoder11(this, _currentEncaps, _sliceObjects, vfm); } } } string -IceInternal::BasicStream::EncapsDecoder::readTypeId(bool isIndex) +Ice::InputStream::EncapsDecoder::readTypeId(bool isIndex) { if(isIndex) { Int index = _stream->readSize(); - TypeIdReadMap::const_iterator k = _typeIdMap.find(index); + TypeIdMap::const_iterator k = _typeIdMap.find(index); if(k == _typeIdMap.end()) { throw UnmarshalOutOfBoundsException(__FILE__, __LINE__); @@ -1917,7 +1526,7 @@ IceInternal::BasicStream::EncapsDecoder::readTypeId(bool isIndex) } Ice::ValuePtr -IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId) +Ice::InputStream::EncapsDecoder::newInstance(const string& typeId) { Ice::ValuePtr v; @@ -1925,25 +1534,32 @@ IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId) // Try to find a factory registered for the specific type. // #ifdef ICE_CPP11_MAPPING - function<ValuePtr (const string&)> userFactory = _servantFactoryManager->find(typeId); - if(userFactory) + function<ValuePtr (const string&)> userFactory; + if(_valueFactoryManager) { - v = userFactory(typeId); + userFactory = _valueFactoryManager->find(typeId); + if(userFactory) + { + v = userFactory(typeId); + } } #else - ValueFactoryPtr userFactory = _servantFactoryManager->find(typeId); - if(userFactory) + ValueFactoryPtr userFactory; + if(_valueFactoryManager) { - v = userFactory->create(typeId); + userFactory = _valueFactoryManager->find(typeId); + if(userFactory) + { + v = userFactory->create(typeId); + } } #endif // - // If that fails, invoke the default factory if one has been - // registered. + // If that fails, invoke the default factory if one has been registered. // - if(!v) + if(!v && _valueFactoryManager) { - userFactory = _servantFactoryManager->find(""); + userFactory = _valueFactoryManager->find(""); if(userFactory) { #ifdef ICE_CPP11_MAPPING @@ -1980,7 +1596,7 @@ IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId) } void -IceInternal::BasicStream::EncapsDecoder::addPatchEntry(Int index, PatchFunc patchFunc, void* patchAddr) +Ice::InputStream::EncapsDecoder::addPatchEntry(Int index, PatchFunc patchFunc, void* patchAddr) { assert(index > 0); @@ -2021,7 +1637,7 @@ IceInternal::BasicStream::EncapsDecoder::addPatchEntry(Int index, PatchFunc patc } void -IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePtr& v) +Ice::InputStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePtr& v) { // // Add the object to the map of un-marshalled objects, this must @@ -2059,26 +1675,7 @@ IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePt if(_objectList.empty() && _patchMap.empty()) { - try - { -#ifndef ICE_CPP11_MAPPING - if(_stream->instance()->collectObjects()) - { - v->ice_collectable(true); - } -#endif - v->ice_postUnmarshal(); - } - catch(const std::exception& ex) - { - Warning out(_stream->instance()->initializationData().logger); - out << "std::exception raised by ice_postUnmarshal:\n" << ex; - } - catch(...) - { - Warning out(_stream->instance()->initializationData().logger); - out << "unknown exception raised by ice_postUnmarshal"; - } + _stream->postUnmarshal(v); } else { @@ -2094,26 +1691,7 @@ IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePt // for(ObjectList::iterator p = _objectList.begin(); p != _objectList.end(); ++p) { - try - { -#ifndef ICE_CPP11_MAPPING - if(_stream->instance()->collectObjects()) - { - (*p)->ice_collectable(true); - } -#endif - (*p)->ice_postUnmarshal(); - } - catch(const std::exception& ex) - { - Warning out(_stream->instance()->initializationData().logger); - out << "std::exception raised by ice_postUnmarshal:\n" << ex; - } - catch(...) - { - Warning out(_stream->instance()->initializationData().logger); - out << "unknown exception raised by ice_postUnmarshal"; - } + _stream->postUnmarshal(*p); } _objectList.clear(); } @@ -2121,7 +1699,7 @@ IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePt } void -IceInternal::BasicStream::EncapsDecoder10::read(PatchFunc patchFunc, void* patchAddr) +Ice::InputStream::EncapsDecoder10::read(PatchFunc patchFunc, void* patchAddr) { assert(patchFunc && patchAddr); @@ -2152,7 +1730,7 @@ IceInternal::BasicStream::EncapsDecoder10::read(PatchFunc patchFunc, void* patch } void -IceInternal::BasicStream::EncapsDecoder10::throwException(const UserExceptionFactoryPtr& factory) +Ice::InputStream::EncapsDecoder10::throwException(const UserExceptionFactoryPtr& factory) { assert(_sliceType == NoSlice); @@ -2238,9 +1816,9 @@ IceInternal::BasicStream::EncapsDecoder10::throwException(const UserExceptionFac void #ifndef NDEBUG -IceInternal::BasicStream::EncapsDecoder10::startInstance(SliceType sliceType) +Ice::InputStream::EncapsDecoder10::startInstance(SliceType sliceType) #else -IceInternal::BasicStream::EncapsDecoder10::startInstance(SliceType) +Ice::InputStream::EncapsDecoder10::startInstance(SliceType) #endif { assert(_sliceType == sliceType); @@ -2248,7 +1826,7 @@ IceInternal::BasicStream::EncapsDecoder10::startInstance(SliceType) } SlicedDataPtr -IceInternal::BasicStream::EncapsDecoder10::endInstance(bool) +Ice::InputStream::EncapsDecoder10::endInstance(bool) { // // Read the Ice::Object slice. @@ -2268,7 +1846,7 @@ IceInternal::BasicStream::EncapsDecoder10::endInstance(bool) } const std::string& -IceInternal::BasicStream::EncapsDecoder10::startSlice() +Ice::InputStream::EncapsDecoder10::startSlice() { // // If first slice, don't read the header, it was already read in @@ -2306,31 +1884,20 @@ IceInternal::BasicStream::EncapsDecoder10::startSlice() } void -IceInternal::BasicStream::EncapsDecoder10::endSlice() +Ice::InputStream::EncapsDecoder10::endSlice() { } void -IceInternal::BasicStream::EncapsDecoder10::skipSlice() +Ice::InputStream::EncapsDecoder10::skipSlice() { - if(_stream->instance()->traceLevels()->slicing > 0) - { - const Ice::LoggerPtr& logger = _stream->instance()->initializationData().logger; - if(_sliceType == ExceptionSlice) - { - traceSlicing("exception", _typeId, _stream->instance()->traceLevels()->slicingCat, logger); - } - else - { - traceSlicing("object", _typeId, _stream->instance()->traceLevels()->slicingCat, logger); - } - } + _stream->traceSkipSlice(_typeId, _sliceType); assert(_sliceSize >= 4); _stream->skip(_sliceSize - sizeof(Int)); } void -IceInternal::BasicStream::EncapsDecoder10::readPendingObjects() +Ice::InputStream::EncapsDecoder10::readPendingObjects() { Int num; do @@ -2354,7 +1921,7 @@ IceInternal::BasicStream::EncapsDecoder10::readPendingObjects() } void -IceInternal::BasicStream::EncapsDecoder10::readInstance() +Ice::InputStream::EncapsDecoder10::readInstance() { Int index; _stream->read(index); @@ -2417,7 +1984,7 @@ IceInternal::BasicStream::EncapsDecoder10::readInstance() } void -IceInternal::BasicStream::EncapsDecoder11::read(PatchFunc patchFunc, void* patchAddr) +Ice::InputStream::EncapsDecoder11::read(PatchFunc patchFunc, void* patchAddr) { Int index = _stream->readSize(); if(index < 0) @@ -2465,7 +2032,7 @@ IceInternal::BasicStream::EncapsDecoder11::read(PatchFunc patchFunc, void* patch } void -IceInternal::BasicStream::EncapsDecoder11::throwException(const UserExceptionFactoryPtr& factory) +Ice::InputStream::EncapsDecoder11::throwException(const UserExceptionFactoryPtr& factory) { assert(!_current); @@ -2536,9 +2103,9 @@ IceInternal::BasicStream::EncapsDecoder11::throwException(const UserExceptionFac void #ifndef NDEBUG -IceInternal::BasicStream::EncapsDecoder11::startInstance(SliceType sliceType) +Ice::InputStream::EncapsDecoder11::startInstance(SliceType sliceType) #else -IceInternal::BasicStream::EncapsDecoder11::startInstance(SliceType) +Ice::InputStream::EncapsDecoder11::startInstance(SliceType) #endif { assert(_current->sliceType == sliceType); @@ -2546,7 +2113,7 @@ IceInternal::BasicStream::EncapsDecoder11::startInstance(SliceType) } SlicedDataPtr -IceInternal::BasicStream::EncapsDecoder11::endInstance(bool preserve) +Ice::InputStream::EncapsDecoder11::endInstance(bool preserve) { SlicedDataPtr slicedData; if(preserve) @@ -2560,7 +2127,7 @@ IceInternal::BasicStream::EncapsDecoder11::endInstance(bool preserve) } const std::string& -IceInternal::BasicStream::EncapsDecoder11::startSlice() +Ice::InputStream::EncapsDecoder11::startSlice() { // // If first slice, don't read the header, it was already read in @@ -2623,7 +2190,7 @@ IceInternal::BasicStream::EncapsDecoder11::startSlice() } void -IceInternal::BasicStream::EncapsDecoder11::endSlice() +Ice::InputStream::EncapsDecoder11::endSlice() { if(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS) { @@ -2673,20 +2240,9 @@ IceInternal::BasicStream::EncapsDecoder11::endSlice() } void -IceInternal::BasicStream::EncapsDecoder11::skipSlice() +Ice::InputStream::EncapsDecoder11::skipSlice() { - if(_stream->instance()->traceLevels()->slicing > 0) - { - const Ice::LoggerPtr& logger = _stream->instance()->initializationData().logger; - if(_current->sliceType == ExceptionSlice) - { - traceSlicing("exception", _current->typeId, _stream->instance()->traceLevels()->slicingCat, logger); - } - else - { - traceSlicing("object", _current->typeId, _stream->instance()->traceLevels()->slicingCat, logger); - } - } + _stream->traceSkipSlice(_current->typeId, _current->sliceType); Container::iterator start = _stream->i; @@ -2700,9 +2256,9 @@ IceInternal::BasicStream::EncapsDecoder11::skipSlice() if(_current->sliceType == ObjectSlice) { throw NoValueFactoryException(__FILE__, __LINE__, - "no value factory found and compact format prevents " - "slicing (the sender should use the sliced format instead)", - _current->typeId); + "no value factory found and compact format prevents " + "slicing (the sender should use the sliced format instead)", + _current->typeId); } else { @@ -2762,7 +2318,7 @@ IceInternal::BasicStream::EncapsDecoder11::skipSlice() } bool -IceInternal::BasicStream::EncapsDecoder11::readOpt(Ice::Int readTag, Ice::OptionalFormat expectedFormat) +Ice::InputStream::EncapsDecoder11::readOpt(Ice::Int readTag, Ice::OptionalFormat expectedFormat) { if(!_current) { @@ -2776,7 +2332,7 @@ IceInternal::BasicStream::EncapsDecoder11::readOpt(Ice::Int readTag, Ice::Option } Int -IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc patchFunc, void* patchAddr) +Ice::InputStream::EncapsDecoder11::readInstance(Int index, PatchFunc patchFunc, void* patchAddr) { assert(index > 0); @@ -2804,11 +2360,6 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat startSlice(); const string mostDerivedId = _current->typeId; Ice::ValuePtr v; -#ifdef ICE_CPP11_MAPPING - function<string (int)> compactIdResolver = _stream->instance()->initializationData().compactIdResolver; -#else - const CompactIdResolverPtr& compactIdResolver = _stream->instance()->initializationData().compactIdResolver; -#endif while(true) { if(_current->compactId >= 0) @@ -2816,40 +2367,7 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat // // Translate a compact (numeric) type ID into a string type ID. // - _current->typeId.clear(); - if(compactIdResolver) - { - try - { -#ifdef ICE_CPP11_MAPPING - _current->typeId = compactIdResolver(_current->compactId); -#else - _current->typeId = compactIdResolver->resolve(_current->compactId); -#endif - } - catch(const LocalException&) - { - throw; - } - catch(const std::exception& ex) - { - ostringstream ostr; - ostr << "exception in CompactIdResolver for ID " << _current->compactId; - string msg = ostr.str(); - string what = ex.what(); - if(!what.empty()) - { - msg += ":\n" + what; - } - throw MarshalException(__FILE__, __LINE__, msg); - } - catch(...) - { - ostringstream ostr; - ostr << "unknown exception in CompactIdResolver for ID " << _current->compactId; - throw MarshalException(__FILE__, __LINE__, ostr.str()); - } - } + _current->typeId = _stream->resolveCompactId(_current->compactId); if(_current->typeId.empty()) { _current->typeId = IceInternal::factoryTable->getTypeId(_current->compactId); @@ -2875,7 +2393,7 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat if(!_sliceObjects) { throw NoValueFactoryException(__FILE__, __LINE__, "no value factory found and object slicing is disabled", - _current->typeId); + _current->typeId); } // @@ -2927,7 +2445,7 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat } SlicedDataPtr -IceInternal::BasicStream::EncapsDecoder11::readSlicedData() +Ice::InputStream::EncapsDecoder11::readSlicedData() { if(_current->slices.empty()) // No preserved slices. { @@ -2962,480 +2480,3 @@ IceInternal::BasicStream::EncapsDecoder11::readSlicedData() } return ICE_MAKE_SHARED(SlicedData, _current->slices); } - -Int -IceInternal::BasicStream::EncapsEncoder::registerTypeId(const string& typeId) -{ - TypeIdWriteMap::const_iterator p = _typeIdMap.find(typeId); - if(p != _typeIdMap.end()) - { - return p->second; - } - else - { - _typeIdMap.insert(make_pair(typeId, ++_typeIdIndex)); - return -1; - } -} - -void -IceInternal::BasicStream::EncapsEncoder10::write(const ValuePtr& v) -{ - // - // Object references are encoded as a negative integer in 1.0. - // - if(v) - { - _stream->write(-registerObject(v)); - } - else - { - _stream->write(0); - } -} - -void -IceInternal::BasicStream::EncapsEncoder10::write(const UserException& v) -{ - // - // User exception with the 1.0 encoding start with a boolean - // flag that indicates whether or not the exception uses - // classes. - // - // This allows reading the pending objects even if some part of - // the exception was sliced. - // - bool usesClasses = v.__usesClasses(); - _stream->write(usesClasses); - v.__write(_stream); - if(usesClasses) - { - writePendingObjects(); - } -} - -void -IceInternal::BasicStream::EncapsEncoder10::startInstance(SliceType sliceType, const SlicedDataPtr&) -{ - _sliceType = sliceType; -} - -void -IceInternal::BasicStream::EncapsEncoder10::endInstance() -{ - if(_sliceType == ObjectSlice) - { - // - // Write the Object slice. - // - startSlice(Object::ice_staticId(), -1, true); - _stream->writeSize(0); // For compatibility with the old AFM. - endSlice(); - } - _sliceType = NoSlice; -} - -void -IceInternal::BasicStream::EncapsEncoder10::startSlice(const string& typeId, int, bool /*last*/) -{ - // - // For object slices, encode a boolean to indicate how the type ID - // is encoded and the type ID either as a string or index. For - // exception slices, always encode the type ID as a string. - // - if(_sliceType == ObjectSlice) - { - Int index = registerTypeId(typeId); - if(index < 0) - { - _stream->write(false); - _stream->write(typeId, false); - } - else - { - _stream->write(true); - _stream->writeSize(index); - } - } - else - { - _stream->write(typeId, false); - } - - _stream->write(Int(0)); // Placeholder for the slice length. - - _writeSlice = _stream->b.size(); -} - -void -IceInternal::BasicStream::EncapsEncoder10::endSlice() -{ - // - // Write the slice length. - // - Int sz = static_cast<Int>(_stream->b.size() - _writeSlice + sizeof(Int)); - Byte* dest = &(*(_stream->b.begin() + _writeSlice - sizeof(Int))); - _stream->write(sz, dest); -} - -void -IceInternal::BasicStream::EncapsEncoder10::writePendingObjects() -{ - while(!_toBeMarshaledMap.empty()) - { - // - // Consider the to be marshalled objects as marshalled now, - // this is necessary to avoid adding again the "to be - // marshalled objects" into _toBeMarshaledMap while writing - // objects. - // - _marshaledMap.insert(_toBeMarshaledMap.begin(), _toBeMarshaledMap.end()); - - PtrToIndexMap savedMap; - savedMap.swap(_toBeMarshaledMap); - _stream->writeSize(static_cast<Int>(savedMap.size())); - for(PtrToIndexMap::iterator p = savedMap.begin(); p != savedMap.end(); ++p) - { - // - // Ask the instance to marshal itself. Any new class - // instances that are triggered by the classes marshaled - // are added to toBeMarshaledMap. - // - _stream->write(p->second); - - try - { - p->first->ice_preMarshal(); - } - catch(const std::exception& ex) - { - Warning out(_stream->instance()->initializationData().logger); - out << "std::exception raised by ice_preMarshal:\n" << ex; - } - catch(...) - { - Warning out(_stream->instance()->initializationData().logger); - out << "unknown exception raised by ice_preMarshal"; - } - - p->first->__write(_stream); - } - } - _stream->writeSize(0); // Zero marker indicates end of sequence of sequences of instances. -} - -Int -IceInternal::BasicStream::EncapsEncoder10::registerObject(const ValuePtr& v) -{ - assert(v); - - // - // Look for this instance in the to-be-marshaled map. - // - PtrToIndexMap::const_iterator p = _toBeMarshaledMap.find(v); - if(p != _toBeMarshaledMap.end()) - { - return p->second; - } - - // - // Didn't find it, try the marshaled map next. - // - PtrToIndexMap::const_iterator q = _marshaledMap.find(v); - if(q != _marshaledMap.end()) - { - return q->second; - } - - // - // We haven't seen this instance previously, create a new - // index, and insert it into the to-be-marshaled map. - // - _toBeMarshaledMap.insert(make_pair(v, ++_objectIdIndex)); - return _objectIdIndex; -} - -void -IceInternal::BasicStream::EncapsEncoder11::write(const ValuePtr& v) -{ - if(!v) - { - _stream->writeSize(0); // Nil reference. - } - else if(_current && _encaps->format == SlicedFormat) - { - // - // If writting an object within a slice and using the sliced - // format, write an index from the object indirection - // table. The indirect object table is encoded at the end of - // each slice and is always read (even if the Slice is - // unknown). - // - PtrToIndexMap::const_iterator p = _current->indirectionMap.find(v); - if(p == _current->indirectionMap.end()) - { - _current->indirectionTable.push_back(v); - Int idx = static_cast<Int>(_current->indirectionTable.size()); // Position + 1 (0 is reserved for nil) - _current->indirectionMap.insert(make_pair(v, idx)); - _stream->writeSize(idx); - } - else - { - _stream->writeSize(p->second); - } - } - else - { - writeInstance(v); // Write the instance or a reference if already marshaled. - } -} - -void -IceInternal::BasicStream::EncapsEncoder11::write(const UserException& v) -{ - v.__write(_stream); -} - -void -IceInternal::BasicStream::EncapsEncoder11::startInstance(SliceType sliceType, const SlicedDataPtr& data) -{ - if(!_current) - { - _current = &_preAllocatedInstanceData; - } - else - { - _current = _current->next ? _current->next : new InstanceData(_current); - } - _current->sliceType = sliceType; - _current->firstSlice = true; - - if(data) - { - writeSlicedData(data); - } -} - -void -IceInternal::BasicStream::EncapsEncoder11::endInstance() -{ - _current = _current->previous; -} - -void -IceInternal::BasicStream::EncapsEncoder11::startSlice(const string& typeId, int compactId, bool last) -{ - assert(_current->indirectionTable.empty() && _current->indirectionMap.empty()); - - _current->sliceFlagsPos = _stream->b.size(); - - _current->sliceFlags = 0; - if(_encaps->format == SlicedFormat) - { - _current->sliceFlags |= FLAG_HAS_SLICE_SIZE; // Encode the slice size if using the sliced format. - } - if(last) - { - _current->sliceFlags |= FLAG_IS_LAST_SLICE; // This is the last slice. - } - - _stream->write(Byte(0)); // Placeholder for the slice flags - - // - // For object slices, encode the flag and the type ID either as a - // string or index. For exception slices, always encode the type - // ID a string. - // - if(_current->sliceType == ObjectSlice) - { - // - // Encode the type ID (only in the first slice for the compact - // encoding). - // - if(_encaps->format == SlicedFormat || _current->firstSlice) - { - if(compactId >= 0) - { - _current->sliceFlags |= FLAG_HAS_TYPE_ID_COMPACT; - _stream->writeSize(compactId); - } - else - { - Int index = registerTypeId(typeId); - if(index < 0) - { - _current->sliceFlags |= FLAG_HAS_TYPE_ID_STRING; - _stream->write(typeId, false); - } - else - { - _current->sliceFlags |= FLAG_HAS_TYPE_ID_INDEX; - _stream->writeSize(index); - } - } - } - } - else - { - _stream->write(typeId, false); - } - - if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE) - { - _stream->write(Int(0)); // Placeholder for the slice length. - } - - _current->writeSlice = _stream->b.size(); - _current->firstSlice = false; -} - -void -IceInternal::BasicStream::EncapsEncoder11::endSlice() -{ - // - // Write the optional member end marker if some optional members - // were encoded. Note that the optional members are encoded before - // the indirection table and are included in the slice size. - // - if(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS) - { - _stream->write(OPTIONAL_END_MARKER); - } - - // - // Write the slice length if necessary. - // - if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE) - { - Int sz = static_cast<Int>(_stream->b.size() - _current->writeSlice + sizeof(Int)); - Byte* dest = &(*(_stream->b.begin() + _current->writeSlice - sizeof(Int))); - _stream->write(sz, dest); - } - - // - // Only write the indirection table if it contains entries. - // - if(!_current->indirectionTable.empty()) - { - assert(_encaps->format == SlicedFormat); - _current->sliceFlags |= FLAG_HAS_INDIRECTION_TABLE; - - // - // Write the indirection object table. - // - _stream->writeSize(static_cast<Int>(_current->indirectionTable.size())); - ObjectList::const_iterator p; - for(p = _current->indirectionTable.begin(); p != _current->indirectionTable.end(); ++p) - { - writeInstance(*p); - } - _current->indirectionTable.clear(); - _current->indirectionMap.clear(); - } - - // - // Finally, update the slice flags. - // - Byte* dest = &(*(_stream->b.begin() + _current->sliceFlagsPos)); - *dest = _current->sliceFlags; -} - -bool -IceInternal::BasicStream::EncapsEncoder11::writeOpt(Ice::Int tag, Ice::OptionalFormat format) -{ - if(!_current) - { - return _stream->writeOptImpl(tag, format); - } - else - { - if(_stream->writeOptImpl(tag, format)) - { - _current->sliceFlags |= FLAG_HAS_OPTIONAL_MEMBERS; - return true; - } - else - { - return false; - } - } -} - -void -IceInternal::BasicStream::EncapsEncoder11::writeSlicedData(const SlicedDataPtr& slicedData) -{ - assert(slicedData); - - // - // We only remarshal preserved slices if we are using the sliced - // format. Otherwise, we ignore the preserved slices, which - // essentially "slices" the object into the most-derived type - // known by the sender. - // - if(_encaps->format != SlicedFormat) - { - return; - } - - for(SliceInfoSeq::const_iterator p = slicedData->slices.begin(); p != slicedData->slices.end(); ++p) - { - startSlice((*p)->typeId, (*p)->compactId, (*p)->isLastSlice); - - // - // Write the bytes associated with this slice. - // - _stream->writeBlob((*p)->bytes); - - if((*p)->hasOptionalMembers) - { - _current->sliceFlags |= FLAG_HAS_OPTIONAL_MEMBERS; - } - - // - // Make sure to also re-write the object indirection table. - // - _current->indirectionTable = (*p)->objects; - - endSlice(); - } -} - -void -IceInternal::BasicStream::EncapsEncoder11::writeInstance(const ValuePtr& v) -{ - assert(v); - - // - // If the instance was already marshaled, just write it's ID. - // - PtrToIndexMap::const_iterator q = _marshaledMap.find(v); - if(q != _marshaledMap.end()) - { - _stream->writeSize(q->second); - return; - } - - // - // We haven't seen this instance previously, create a new ID, - // insert it into the marshaled map, and write the instance. - // - _marshaledMap.insert(make_pair(v, ++_objectIdIndex)); - - try - { - v->ice_preMarshal(); - } - catch(const std::exception& ex) - { - Warning out(_stream->instance()->initializationData().logger); - out << "std::exception raised by ice_preMarshal:\n" << ex; - } - catch(...) - { - Warning out(_stream->instance()->initializationData().logger); - out << "unknown exception raised by ice_preMarshal"; - } - - _stream->writeSize(1); // Object instance marker. - v->__write(_stream); -} diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index bcc79091555..308559e8823 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -18,7 +18,7 @@ #include <Ice/ProxyFactory.h> #include <Ice/ThreadPool.h> #include <Ice/ConnectionFactory.h> -#include <Ice/ValueFactoryManager.h> +#include <Ice/ValueFactoryManagerI.h> #include <Ice/LocalException.h> #include <Ice/ObjectAdapterFactory.h> #include <Ice/Exception.h> @@ -42,7 +42,9 @@ #include <Ice/LoggerAdminI.h> #include <Ice/RegisterPluginsInit.h> #include <Ice/ObserverHelper.h> +#include <Ice/Functional.h> +#include <IceUtil/DisableWarnings.h> #include <IceUtil/StringUtil.h> #include <IceUtil/UUID.h> #include <IceUtil/Mutex.h> @@ -396,20 +398,6 @@ IceInternal::Instance::outgoingConnectionFactory() const return _outgoingConnectionFactory; } -ValueFactoryManagerPtr -IceInternal::Instance::servantFactoryManager() const -{ - Lock sync(*this); - - if(_state == StateDestroyed) - { - throw CommunicatorDestroyedException(__FILE__, __LINE__); - } - - assert(_servantFactoryManager); - return _servantFactoryManager; -} - ObjectAdapterFactoryPtr IceInternal::Instance::objectAdapterFactory() const { @@ -1358,9 +1346,14 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi _pluginManager = ICE_MAKE_SHARED(PluginManagerI, communicator, _dynamicLibraryList); - _outgoingConnectionFactory = new OutgoingConnectionFactory(communicator, this); + if(!_initData.valueFactoryManager) + { + _initData.valueFactoryManager = ICE_MAKE_SHARED(ValueFactoryManagerI); + } + + _objectFactoryMapHint = _objectFactoryMap.end(); - _servantFactoryManager = new ValueFactoryManager(); + _outgoingConnectionFactory = new OutgoingConnectionFactory(communicator, this); _objectAdapterFactory = ICE_MAKE_SHARED(ObjectAdapterFactory, this, communicator); @@ -1395,7 +1388,6 @@ IceInternal::Instance::~Instance() assert(!_proxyFactory); assert(!_outgoingConnectionFactory); - assert(!_servantFactoryManager); assert(!_objectAdapterFactory); assert(!_clientThreadPool); assert(!_serverThreadPool); @@ -1781,10 +1773,9 @@ IceInternal::Instance::destroy() } #endif - if(_servantFactoryManager) - { - _servantFactoryManager->destroy(); - } + for_each(_objectFactoryMap.begin(), _objectFactoryMap.end(), + Ice::secondVoidMemFun<const string, ObjectFactory>(&ObjectFactory::destroy)); + _objectFactoryMap.clear(); if(_routerManager) { @@ -1835,7 +1826,6 @@ IceInternal::Instance::destroy() _endpointHostResolver = 0; _timer = 0; - _servantFactoryManager = 0; _referenceFactory = 0; _requestHandlerFactory = 0; _proxyFactory = 0; @@ -1948,6 +1938,82 @@ IceInternal::Instance::setRcvBufSizeWarn(Short type, int size) _setBufSizeWarn[type] = info; } +void +IceInternal::Instance::addObjectFactory(const Ice::ObjectFactoryPtr& factory, const string& id) +{ + Lock sync(*this); + + // + // Create a ValueFactory wrapper around the given ObjectFactory and register the wrapper + // with the value factory manager. This may raise AlreadyRegisteredException. + // +#ifdef ICE_CPP11_MAPPING + _initData.valueFactoryManager->add([factory](const string& id) + { + return factory->create(id); + }, + id); +#else + class ValueFactoryWrapper: public Ice::ValueFactory + { + public: + + ValueFactoryWrapper(const Ice::ObjectFactoryPtr& factory) : _objectFactory(factory) + { + } + + Ice::ValuePtr create(const std::string& id) + { + return _objectFactory->create(id); + } + + private: + + Ice::ObjectFactoryPtr _objectFactory; + }; + + _initData.valueFactoryManager->add(new ValueFactoryWrapper(factory), id); +#endif + + // + // Also record the object factory in our own map. + // + _objectFactoryMapHint = _objectFactoryMap.insert(_objectFactoryMapHint, + pair<const string, Ice::ObjectFactoryPtr>(id, factory)); +} + +Ice::ObjectFactoryPtr +IceInternal::Instance::findObjectFactory(const string& id) const +{ + Lock sync(*this); + + ObjectFactoryMap& objectfactoryMap = const_cast<ObjectFactoryMap&>(_objectFactoryMap); + + ObjectFactoryMap::iterator p = objectfactoryMap.end(); + if(_objectFactoryMapHint != objectfactoryMap.end()) + { + if(_objectFactoryMapHint->first == id) + { + p = _objectFactoryMapHint; + } + } + + if(p == objectfactoryMap.end()) + { + p = objectfactoryMap.find(id); + } + + if(p != objectfactoryMap.end()) + { + _objectFactoryMapHint = p; + return p->second; + } + else + { + return ICE_NULLPTR; + } +} + IceInternal::ProcessI::ProcessI(const CommunicatorPtr& communicator) : _communicator(communicator) { diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index c91e58de7f2..f93befb897d 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -28,7 +28,7 @@ #include <Ice/ThreadPoolF.h> #include <Ice/ConnectionFactoryF.h> #include <Ice/ACM.h> -#include <Ice/ValueFactoryManagerF.h> +#include <Ice/ObjectFactory.h> #include <Ice/ObjectAdapterFactoryF.h> #include <Ice/EndpointFactoryManagerF.h> #include <Ice/IPEndpointIF.h> @@ -95,7 +95,6 @@ public: RequestHandlerFactoryPtr requestHandlerFactory() const; ProxyFactoryPtr proxyFactory() const; OutgoingConnectionFactoryPtr outgoingConnectionFactory() const; - ValueFactoryManagerPtr servantFactoryManager() const; ObjectAdapterFactoryPtr objectAdapterFactory() const; ProtocolSupport protocolSupport() const; bool preferIPv6() const; @@ -145,6 +144,11 @@ public: void setSndBufSizeWarn(Ice::Short type, int size); void setRcvBufSizeWarn(Ice::Short type, int size); + void addObjectFactory(const Ice::ObjectFactoryPtr&, const std::string&); + Ice::ObjectFactoryPtr findObjectFactory(const std::string&) const; + + typedef std::map<std::string, Ice::ObjectFactoryPtr> ObjectFactoryMap; + private: Instance(const Ice::CommunicatorPtr&, const Ice::InitializationData&); @@ -183,7 +187,6 @@ private: RequestHandlerFactoryPtr _requestHandlerFactory; ProxyFactoryPtr _proxyFactory; OutgoingConnectionFactoryPtr _outgoingConnectionFactory; - ValueFactoryManagerPtr _servantFactoryManager; ObjectAdapterFactoryPtr _objectAdapterFactory; ProtocolSupport _protocolSupport; bool _preferIPv6; @@ -207,6 +210,8 @@ private: IceInternal::MetricsAdminIPtr _metricsAdmin; std::map<Ice::Short, BufSizeWarnInfo> _setBufSizeWarn; IceUtil::Mutex _setBufSizeWarnMutex; + ObjectFactoryMap _objectFactoryMap; + mutable ObjectFactoryMap::iterator _objectFactoryMapHint; }; class ProcessI : public Ice::Process diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index 3f23056288a..abee06fd923 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -59,7 +59,6 @@ OBJS = Acceptor.o \ Application.o \ AsyncResult.o \ Base64.o \ - BasicStream.o \ BatchRequestQueue.o \ Buffer.o \ CollocatedRequestHandler.o \ @@ -85,6 +84,7 @@ OBJS = Acceptor.o \ Incoming.o \ IncomingAsync.o \ Initialize.o \ + InputStream.o \ Instance.o \ InstrumentationI.o \ IPEndpointI.o \ @@ -104,6 +104,7 @@ OBJS = Acceptor.o \ OpaqueEndpointI.o \ Outgoing.o \ OutgoingAsync.o \ + OutputStream.o \ PluginManagerI.o \ PropertiesAdminI.o \ PropertiesI.o \ @@ -125,8 +126,6 @@ OBJS = Acceptor.o \ ServantManager.o \ SliceChecksums.o \ SlicedData.o \ - Stream.o \ - StreamI.o \ StreamSocket.o \ TcpAcceptor.o \ TcpConnector.o \ @@ -140,7 +139,7 @@ OBJS = Acceptor.o \ UdpEndpointI.o \ UdpTransceiver.o \ Value.o \ - ValueFactoryManager.o \ + ValueFactoryManagerI.o \ WSAcceptor.o \ WSConnector.o \ WSEndpoint.o \ diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index 4cefc074bd5..987ddf14620 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -61,7 +61,6 @@ OBJS = .\Acceptor.obj \ .\Application.obj \ .\AsyncResult.obj \ .\Base64.obj \ - .\BasicStream.obj \ .\BatchRequestQueue.obj \ .\Buffer.obj \ .\CollocatedRequestHandler.obj \ @@ -87,6 +86,7 @@ OBJS = .\Acceptor.obj \ .\Incoming.obj \ .\IncomingAsync.obj \ .\Initialize.obj \ + .\InputStream.obj \ .\Instance.obj \ .\InstrumentationI.obj \ .\IPEndpointI.obj \ @@ -106,6 +106,7 @@ OBJS = .\Acceptor.obj \ .\OpaqueEndpointI.obj \ .\Outgoing.obj \ .\OutgoingAsync.obj \ + .\OutputStream.obj \ .\PluginManagerI.obj \ .\PropertiesAdminI.obj \ .\PropertiesI.obj \ @@ -128,8 +129,6 @@ OBJS = .\Acceptor.obj \ .\Service.obj \ .\SliceChecksums.obj \ .\SlicedData.obj \ - .\Stream.obj \ - .\StreamI.obj \ .\StreamSocket.obj \ .\TcpAcceptor.obj \ .\TcpConnector.obj \ @@ -143,7 +142,7 @@ OBJS = .\Acceptor.obj \ .\UdpEndpointI.obj \ .\UdpTransceiver.obj \ .\Value.obj \ - .\ValueFactoryManager.obj \ + .\ValueFactoryManagerI.obj \ .\WSAcceptor.obj \ .\WSConnector.obj \ .\WSEndpoint.obj \ diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index bc0e1df7843..881e1581806 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -12,7 +12,6 @@ #include <Ice/IncomingAsync.h> #include <Ice/IncomingRequest.h> #include <Ice/LocalException.h> -#include <Ice/Stream.h> #include <Ice/SlicedData.h> using namespace std; @@ -103,7 +102,7 @@ Ice::Object::ice_clone() const DispatchStatus Ice::Object::___ice_isA(Incoming& __inS, const Current& __current) { - BasicStream* __is = __inS.startReadParams(); + InputStream* __is = __inS.startReadParams(); string __id; __is->read(__id, false); __inS.endReadParams(); @@ -112,7 +111,7 @@ Ice::Object::___ice_isA(Incoming& __inS, const Current& __current) #else bool __ret = ice_isA(__id, __current); #endif - BasicStream* __os = __inS.__startWriteParams(DefaultFormat); + OutputStream* __os = __inS.__startWriteParams(DefaultFormat); __os->write(__ret); __inS.__endWriteParams(true); return DispatchOK; @@ -132,7 +131,7 @@ Ice::Object::___ice_ids(Incoming& __inS, const Current& __current) { __inS.readEmptyParams(); vector<string> __ret = ice_ids(__current); - BasicStream* __os = __inS.__startWriteParams(DefaultFormat); + OutputStream* __os = __inS.__startWriteParams(DefaultFormat); __os->write(&__ret[0], &__ret[0] + __ret.size(), false); __inS.__endWriteParams(true); return DispatchOK; @@ -143,7 +142,7 @@ Ice::Object::___ice_id(Incoming& __inS, const Current& __current) { __inS.readEmptyParams(); string __ret = ice_id(__current); - BasicStream* __os = __inS.__startWriteParams(DefaultFormat); + OutputStream* __os = __inS.__startWriteParams(DefaultFormat); __os->write(__ret, false); __inS.__endWriteParams(true); return DispatchOK; @@ -241,23 +240,7 @@ Ice::Object::ice_postUnmarshal() } void -Ice::Object::__write(IceInternal::BasicStream* os) const -{ - os->startWriteObject(0); - __writeImpl(os); - os->endWriteObject(); -} - -void -Ice::Object::__read(IceInternal::BasicStream* is) -{ - is->startReadObject(); - __readImpl(is); - is->endReadObject(false); -} - -void -Ice::Object::__write(const OutputStreamPtr& os) const +Ice::Object::__write(Ice::OutputStream* os) const { os->startObject(0); __writeImpl(os); @@ -265,25 +248,13 @@ Ice::Object::__write(const OutputStreamPtr& os) const } void -Ice::Object::__read(const InputStreamPtr& is) +Ice::Object::__read(Ice::InputStream* is) { - is->startObject(); + is->startObject(); __readImpl(is); is->endObject(false); } -void -Ice::Object::__writeImpl(const OutputStreamPtr&) const -{ - throw MarshalException(__FILE__, __LINE__, "class was not generated with stream support"); -} - -void -Ice::Object::__readImpl(const InputStreamPtr&) -{ - throw MarshalException(__FILE__, __LINE__, "class was not generated with stream support"); -} - Ice::Int Ice::Object::ice_operationAttributes(const string&) const { @@ -561,15 +532,3 @@ Ice::BlobjectArrayAsync::__dispatch(Incoming& in, const Current& current) #endif return DispatchAsync; } - -void -Ice::ice_writeObject(const OutputStreamPtr& out, const ValuePtr& p) -{ - out->write(p); -} - -void -Ice::ice_readObject(const InputStreamPtr& in, ValuePtr& p) -{ - in->read(p); -} diff --git a/cpp/src/Ice/OpaqueEndpointI.cpp b/cpp/src/Ice/OpaqueEndpointI.cpp index baa0de85135..93e701b2132 100644 --- a/cpp/src/Ice/OpaqueEndpointI.cpp +++ b/cpp/src/Ice/OpaqueEndpointI.cpp @@ -8,7 +8,8 @@ // ********************************************************************** #include <Ice/OpaqueEndpointI.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/Exception.h> #include <Ice/DefaultsAndOverrides.h> #include <Ice/Base64.h> @@ -46,10 +47,10 @@ IceInternal::OpaqueEndpointI::OpaqueEndpointI(vector<string>& args) : } } -IceInternal::OpaqueEndpointI::OpaqueEndpointI(Short type, BasicStream* s) : _type(type) +IceInternal::OpaqueEndpointI::OpaqueEndpointI(Short type, InputStream* s) : _type(type) { - _rawEncoding = s->getReadEncoding(); - Int sz = s->getReadEncapsSize(); + _rawEncoding = s->getEncoding(); + Int sz = s->getEncapsSize(); s->readBlob(const_cast<vector<Byte>&>(_rawBytes), sz); } @@ -97,11 +98,11 @@ OpaqueEndpointInfoI::OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVer } void -IceInternal::OpaqueEndpointI::streamWrite(BasicStream* s) const +IceInternal::OpaqueEndpointI::streamWrite(OutputStream* s) const { - s->startWriteEncaps(_rawEncoding, DefaultFormat); + s->startEncapsulation(_rawEncoding, DefaultFormat); s->writeBlob(_rawBytes); - s->endWriteEncaps(); + s->endEncapsulation(); } Ice::EndpointInfoPtr diff --git a/cpp/src/Ice/OpaqueEndpointI.h b/cpp/src/Ice/OpaqueEndpointI.h index caa67476a8e..d5b55883bbc 100644 --- a/cpp/src/Ice/OpaqueEndpointI.h +++ b/cpp/src/Ice/OpaqueEndpointI.h @@ -21,9 +21,9 @@ class OpaqueEndpointI : public EndpointI, public Ice::EnableSharedFromThis<Opaqu public: OpaqueEndpointI(std::vector<std::string>&); - OpaqueEndpointI(Ice::Short, BasicStream*); + OpaqueEndpointI(Ice::Short, Ice::InputStream*); - virtual void streamWrite(BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; virtual Ice::EndpointInfoPtr getInfo() const; virtual Ice::Short type() const; virtual const std::string& protocol() const; diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index ca04e352075..acd1a5e829e 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -91,7 +91,7 @@ ProxyOutgoingBase::completed(const Ice::Exception& ex) } void -ProxyOutgoingBase::completed(BasicStream& is) +ProxyOutgoingBase::completed(InputStream&) { assert(false); // Must be overriden } @@ -406,7 +406,7 @@ Outgoing::abort(const LocalException& ex) } void -Outgoing::completed(BasicStream& is) +Outgoing::completed(InputStream& is) { Monitor<Mutex>::Lock sync(_monitor); @@ -580,12 +580,12 @@ Outgoing::throwUserException() { try { - _is.startReadEncaps(); + _is.startEncapsulation(); _is.throwException(); } catch(const Ice::UserException&) { - _is.endReadEncaps(); + _is.endEncapsulation(); throw; } } @@ -687,7 +687,7 @@ ConnectionFlushBatch::completed(const Ice::Exception& ex) } void -ConnectionFlushBatch::completed(BasicStream& is) +ConnectionFlushBatch::completed(InputStream&) { assert(false); } diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 5c60223e335..5c06c76a3fe 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -48,7 +48,7 @@ OutgoingAsyncBase::completed() return false; } -BasicStream* +InputStream* OutgoingAsyncBase::getIs() { return 0; // Must be overriden by request that can handle responses @@ -1107,7 +1107,7 @@ OnewayClosureCallback::invoke( const shared_ptr<Ice::ObjectPrx>& __proxy, Ice::OperationMode __mode, Ice::FormatType __format, - function<void (BasicStream*)> __marshal, + function<void (OutputStream*)> __marshal, function<void ()> __response, function<void (exception_ptr)> __exception, function<void (bool)> __sent, @@ -1148,7 +1148,7 @@ TwowayClosureCallback::TwowayClosureCallback( const string& name, const shared_ptr<Ice::ObjectPrx>& proxy, bool readEmptyParams, - function<void (BasicStream*)> read, + function<void (InputStream*)> read, function<void (const UserException&)> userException, function<void (exception_ptr)> exception, function<void (bool)> sent) : @@ -1230,9 +1230,9 @@ TwowayClosureCallback::invoke( const shared_ptr<Ice::ObjectPrx>& __proxy, OperationMode __mode, FormatType __format, - function<void (BasicStream*)> __write, + function<void (OutputStream*)> __write, bool __readEmptyParams, - function<void (BasicStream*)> __read, + function<void (InputStream*)> __read, function<void (const UserException&)> __userException, function<void (exception_ptr)> __exception, function<void (bool)> __sent, diff --git a/cpp/src/Ice/OutputStream.cpp b/cpp/src/Ice/OutputStream.cpp new file mode 100644 index 00000000000..1f784ad3675 --- /dev/null +++ b/cpp/src/Ice/OutputStream.cpp @@ -0,0 +1,1375 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#include <IceUtil/DisableWarnings.h> +#include <Ice/OutputStream.h> +#include <Ice/DefaultsAndOverrides.h> +#include <Ice/Instance.h> +#include <Ice/Object.h> +#include <Ice/Proxy.h> +#include <Ice/ProxyFactory.h> +#include <Ice/ValueFactory.h> +#include <Ice/LocalException.h> +#include <Ice/Protocol.h> +#include <Ice/TraceUtil.h> +#include <Ice/LoggerUtil.h> +#include <Ice/SlicedData.h> +#include <IceUtil/StringConverter.h> +#include <iterator> + +using namespace std; +using namespace Ice; +using namespace IceInternal; + +namespace +{ + +class StreamUTF8BufferI : public IceUtil::UTF8Buffer +{ +public: + + StreamUTF8BufferI(OutputStream& stream) : + _stream(stream) + { + } + + Ice::Byte* getMoreBytes(size_t howMany, Ice::Byte* firstUnused) + { + assert(howMany > 0); + + if(firstUnused != 0) + { + // + // Return unused bytes + // + _stream.resize(firstUnused - _stream.b.begin()); + } + + // + // Index of first unused byte + // + Buffer::Container::size_type pos = _stream.b.size(); + + // + // Since resize may reallocate the buffer, when firstUnused != 0, the + // return value can be != firstUnused + // + _stream.resize(pos + howMany); + + return &_stream.b[pos]; + } + +private: + + OutputStream& _stream; +}; + +} + +Ice::OutputStream::OutputStream() : + _instance(0), + _closure(0), + _encoding(currentEncoding), + _format(CompactFormat), + _currentEncaps(0) +{ + // + // Initialize the encoding member of our pre-allocated encapsulation, in case + // this stream is used without an explicit encapsulation. + // + _preAllocatedEncaps.encoding = _encoding; +} + +Ice::OutputStream::OutputStream(const CommunicatorPtr& communicator) : + _closure(0), + _currentEncaps(0) +{ + initialize(communicator); +} + +Ice::OutputStream::OutputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding) : + _closure(0), + _currentEncaps(0) +{ + initialize(communicator, encoding); +} + +Ice::OutputStream::OutputStream(Instance* instance, const EncodingVersion& encoding) : + _closure(0), + _currentEncaps(0) +{ + initialize(instance, encoding); +} + +void +Ice::OutputStream::initialize(const CommunicatorPtr& communicator) +{ + assert(communicator); + InstancePtr instance = getInstance(communicator); + initialize(instance.get(), instance->defaultsAndOverrides()->defaultEncoding); +} + +void +Ice::OutputStream::initialize(const CommunicatorPtr& communicator, const EncodingVersion& encoding) +{ + assert(communicator); + InstancePtr instance = getInstance(communicator); + initialize(instance.get(), encoding); +} + +void +Ice::OutputStream::initialize(Instance* instance, const EncodingVersion& encoding) +{ + assert(instance); + + _instance = instance; + _encoding = encoding; + + _stringConverter = _instance->getStringConverter(); + _wstringConverter = _instance->getWstringConverter(); + + _format = _instance->defaultsAndOverrides()->defaultFormat; + + // + // Initialize the encoding member of our pre-allocated encapsulation, in case + // this stream is used without an explicit encapsulation. + // + _preAllocatedEncaps.encoding = encoding; +} + +void +Ice::OutputStream::clear() +{ + while(_currentEncaps && _currentEncaps != &_preAllocatedEncaps) + { + Encaps* oldEncaps = _currentEncaps; + _currentEncaps = _currentEncaps->previous; + delete oldEncaps; + } +} + +void +Ice::OutputStream::setStringConverters(const IceUtil::StringConverterPtr& sc, const IceUtil::WstringConverterPtr& wsc) +{ + _stringConverter = sc; + _wstringConverter = wsc; +} + +void +Ice::OutputStream::setFormat(FormatType fmt) +{ + _format = fmt; +} + +void* +Ice::OutputStream::getClosure() const +{ + return _closure; +} + +void* +Ice::OutputStream::setClosure(void* p) +{ + void* prev = _closure; + _closure = p; + return prev; +} + +void +Ice::OutputStream::swap(OutputStream& other) +{ + assert(_instance == other._instance); + + swapBuffer(other); + + std::swap(_closure, other._closure); + + // + // Swap is never called for streams that have encapsulations being written. However, + // encapsulations might still be set in case marshalling failed. We just + // reset the encapsulations if there are still some set. + // + resetEncapsulation(); + other.resetEncapsulation(); +} + +void +Ice::OutputStream::resetEncapsulation() +{ + while(_currentEncaps && _currentEncaps != &_preAllocatedEncaps) + { + Encaps* oldEncaps = _currentEncaps; + _currentEncaps = _currentEncaps->previous; + delete oldEncaps; + } + + _preAllocatedEncaps.reset(); +} + +void +Ice::OutputStream::startEncapsulation() +{ + // + // If no encoding version is specified, use the current write + // encapsulation encoding version if there's a current write + // encapsulation, otherwise, use the stream encoding version. + // + + if(_currentEncaps) + { + startEncapsulation(_currentEncaps->encoding, _currentEncaps->format); + } + else + { + startEncapsulation(_encoding, Ice::DefaultFormat); + } +} + +void +Ice::OutputStream::writePendingObjects() +{ + if(_currentEncaps && _currentEncaps->encoder) + { + _currentEncaps->encoder->writePendingObjects(); + } + else if(getEncoding() == Ice::Encoding_1_0) + { + // + // If using the 1.0 encoding and no objects were written, we + // still write an empty sequence for pending objects if + // requested (i.e.: if this is called). + // + // This is required by the 1.0 encoding, even if no objects + // are written we do marshal an empty sequence if marshaled + // data types use classes. + // + writeSize(0); + } +} + +void +Ice::OutputStream::writeBlob(const vector<Byte>& v) +{ + if(!v.empty()) + { + Container::size_type pos = b.size(); + resize(pos + v.size()); + memcpy(&b[pos], &v[0], v.size()); + } +} + +void +Ice::OutputStream::write(const Byte* begin, const Byte* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz); + memcpy(&b[pos], begin, sz); + } +} + +void +Ice::OutputStream::write(const vector<bool>& v) +{ + Int sz = static_cast<Int>(v.size()); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz); + copy(v.begin(), v.end(), b.begin() + pos); + } +} + +namespace +{ + +template<size_t boolSize> +struct WriteBoolHelper +{ + static void write(const bool* begin, OutputStream::Container::size_type pos, OutputStream::Container& b, Int sz) + { + for(int idx = 0; idx < sz; ++idx) + { + b[pos + idx] = static_cast<Byte>(*(begin + idx)); + } + } +}; + +template<> +struct WriteBoolHelper<1> +{ + static void write(const bool* begin, OutputStream::Container::size_type pos, OutputStream::Container& b, Int sz) + { + memcpy(&b[pos], begin, sz); + } +}; + +} + +void +Ice::OutputStream::write(const bool* begin, const bool* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz); + WriteBoolHelper<sizeof(bool)>::write(begin, pos, b, sz); + } +} + +void +Ice::OutputStream::write(Short v) +{ + Container::size_type pos = b.size(); + resize(pos + sizeof(Short)); + Byte* dest = &b[pos]; +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Short) - 1; + *dest++ = *src--; + *dest = *src; +#else + const Byte* src = reinterpret_cast<const Byte*>(&v); + *dest++ = *src++; + *dest = *src; +#endif +} + +void +Ice::OutputStream::write(const Short* begin, const Short* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz * sizeof(Short)); +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Short) - 1; + Byte* dest = &(*(b.begin() + pos)); + for(int j = 0 ; j < sz ; ++j) + { + *dest++ = *src--; + *dest++ = *src--; + src += 2 * sizeof(Short); + } +#else + memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Short)); +#endif + } +} + +void +Ice::OutputStream::write(const Int* begin, const Int* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz * sizeof(Int)); +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Int) - 1; + Byte* dest = &(*(b.begin() + pos)); + for(int j = 0 ; j < sz ; ++j) + { + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + src += 2 * sizeof(Int); + } +#else + memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Int)); +#endif + } +} + +void +Ice::OutputStream::write(Long v) +{ + Container::size_type pos = b.size(); + resize(pos + sizeof(Long)); + Byte* dest = &b[pos]; +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Long) - 1; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest = *src; +#else + const Byte* src = reinterpret_cast<const Byte*>(&v); + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest = *src; +#endif +} + +void +Ice::OutputStream::write(const Long* begin, const Long* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz * sizeof(Long)); +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Long) - 1; + Byte* dest = &(*(b.begin() + pos)); + for(int j = 0 ; j < sz ; ++j) + { + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + src += 2 * sizeof(Long); + } +#else + memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Long)); +#endif + } +} + +void +Ice::OutputStream::write(Float v) +{ + Container::size_type pos = b.size(); + resize(pos + sizeof(Float)); + Byte* dest = &b[pos]; +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Float) - 1; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest = *src; +#else + const Byte* src = reinterpret_cast<const Byte*>(&v); + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest = *src; +#endif +} + +void +Ice::OutputStream::write(const Float* begin, const Float* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz * sizeof(Float)); +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Float) - 1; + Byte* dest = &(*(b.begin() + pos)); + for(int j = 0 ; j < sz ; ++j) + { + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + src += 2 * sizeof(Float); + } +#else + memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Float)); +#endif + } +} + +void +Ice::OutputStream::write(Double v) +{ + Container::size_type pos = b.size(); + resize(pos + sizeof(Double)); + Byte* dest = &b[pos]; +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Double) - 1; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest = *src; +#else + const Byte* src = reinterpret_cast<const Byte*>(&v); +# if defined(ICE_LITTLEBYTE_BIGWORD) + dest[4] = *src++; + dest[5] = *src++; + dest[6] = *src++; + dest[7] = *src++; + dest[0] = *src++; + dest[1] = *src++; + dest[2] = *src++; + dest[3] = *src; +# else + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest = *src; +# endif +#endif +} + +void +Ice::OutputStream::write(const Double* begin, const Double* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz * sizeof(Double)); +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Double) - 1; + Byte* dest = &(*(b.begin() + pos)); + for(int j = 0 ; j < sz ; ++j) + { + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + src += 2 * sizeof(Double); + } +#elif defined(ICE_LITTLEBYTE_BIGWORD) + const Byte* src = reinterpret_cast<const Byte*>(begin); + Byte* dest = &(*(b.begin() + pos)); + for(int j = 0 ; j < sz ; ++j) + { + dest[4] = *src++; + dest[5] = *src++; + dest[6] = *src++; + dest[7] = *src++; + dest[0] = *src++; + dest[1] = *src++; + dest[2] = *src++; + dest[3] = *src++; + dest += sizeof(Double); + } +#else + memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Double)); +#endif + } +} + +// +// NOTE: This member function is intentionally omitted in order to +// cause a link error if it is used. This is for efficiency reasons: +// writing a const char * requires a traversal of the string to get +// the string length first, which takes O(n) time, whereas getting the +// string length from a std::string takes constant time. +// +/* +void +Ice::OutputStream::write(const char*) +{ +} +*/ + +void +Ice::OutputStream::writeConverted(const char* vdata, size_t vsize) +{ + if(!_stringConverter) + { + throw MarshalException(__FILE__, __LINE__, "no string converter provided"); + } + + // + // What is the size of the resulting UTF-8 encoded string? + // Impossible to tell, so we guess. If we don't guess correctly, + // we'll have to fix the mistake afterwards + // + try + { + Int guessedSize = static_cast<Int>(vsize); + writeSize(guessedSize); // writeSize() only writes the size; it does not reserve any buffer space. + + size_t firstIndex = b.size(); + StreamUTF8BufferI buffer(*this); + + Byte* lastByte = _stringConverter->toUTF8(vdata, vdata + vsize, buffer); + if(lastByte != b.end()) + { + resize(lastByte - b.begin()); + } + size_t lastIndex = b.size(); + + Int actualSize = static_cast<Int>(lastIndex - firstIndex); + + // + // Check against the guess + // + if(guessedSize != actualSize) + { + if(guessedSize <= 254 && actualSize > 254) + { + // + // Move the UTF-8 sequence 4 bytes further + // Use memmove instead of memcpy since the source and destination typically overlap. + // + resize(b.size() + 4); + memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize); + } + else if(guessedSize > 254 && actualSize <= 254) + { + // + // Move the UTF-8 sequence 4 bytes back + // + memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize); + resize(b.size() - 4); + } + + if(guessedSize <= 254) + { + rewriteSize(actualSize, b.begin() + firstIndex - 1); + } + else + { + rewriteSize(actualSize, b.begin() + firstIndex - 1 - 4); + } + } + } + catch(const IceUtil::IllegalConversionException& ex) + { + throw StringConversionException(__FILE__, __LINE__, ex.reason()); + } +} + +void +Ice::OutputStream::write(const string* begin, const string* end, bool convert) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + for(int i = 0; i < sz; ++i) + { + write(begin[i], convert); + } + } +} + +void +Ice::OutputStream::write(const wstring& v) +{ + if(v.empty()) + { + writeSize(0); + return; + } + + if(!_wstringConverter) + { + throw MarshalException(__FILE__, __LINE__, "no wstring converter provided"); + } + + // + // What is the size of the resulting UTF-8 encoded string? + // Impossible to tell, so we guess. If we don't guess correctly, + // we'll have to fix the mistake afterwards + // + try + { + Int guessedSize = static_cast<Int>(v.size()); + writeSize(guessedSize); // writeSize() only writes the size; it does not reserve any buffer space. + + size_t firstIndex = b.size(); + StreamUTF8BufferI buffer(*this); + + Byte* lastByte = _wstringConverter->toUTF8(v.data(), v.data() + v.size(), buffer); + if(lastByte != b.end()) + { + resize(lastByte - b.begin()); + } + size_t lastIndex = b.size(); + + Int actualSize = static_cast<Int>(lastIndex - firstIndex); + + // + // Check against the guess + // + if(guessedSize != actualSize) + { + if(guessedSize <= 254 && actualSize > 254) + { + // + // Move the UTF-8 sequence 4 bytes further + // Use memmove instead of memcpy since the source and destination typically overlap. + // + resize(b.size() + 4); + memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize); + } + else if(guessedSize > 254 && actualSize <= 254) + { + // + // Move the UTF-8 sequence 4 bytes back + // + memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize); + resize(b.size() - 4); + } + + if(guessedSize <= 254) + { + rewriteSize(actualSize, b.begin() + firstIndex - 1); + } + else + { + rewriteSize(actualSize, b.begin() + firstIndex - 1 - 4); + } + } + } + catch(const IceUtil::IllegalConversionException& ex) + { + throw StringConversionException(__FILE__, __LINE__, ex.reason()); + } +} + +void +Ice::OutputStream::write(const wstring* begin, const wstring* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + for(int i = 0; i < sz; ++i) + { + write(begin[i]); + } + } +} + +void +#ifdef ICE_CPP11_MAPPING +Ice::OutputStream::writeProxy(const shared_ptr<ObjectPrx>& v) +#else +Ice::OutputStream::write(const ObjectPrx& v) +#endif +{ + if(v) + { + v->__write(*this); + } + else + { + Identity ident; + write(ident); + } +} + +void +Ice::OutputStream::writeEnum(Int v, Int maxValue) +{ + if(getEncoding() == Encoding_1_0) + { + if(maxValue < 127) + { + write(static_cast<Byte>(v)); + } + else if(maxValue < 32767) + { + write(static_cast<Short>(v)); + } + else + { + write(v); + } + } + else + { + writeSize(v); + } +} + +void +Ice::OutputStream::writeException(const UserException& e) +{ + initEncaps(); + _currentEncaps->encoder->write(e); +} + +bool +Ice::OutputStream::writeOptImpl(Int tag, OptionalFormat type) +{ + if(getEncoding() == Encoding_1_0) + { + return false; // Optional members aren't supported with the 1.0 encoding. + } + + Byte v = static_cast<Byte>(type); + if(tag < 30) + { + v |= static_cast<Byte>(tag << 3); + write(v); + } + else + { + v |= 0xF0; // tag = 30 + write(v); + writeSize(tag); + } + return true; +} + +void +Ice::OutputStream::finished(vector<Byte>& bytes) +{ + vector<Byte>(b.begin(), b.end()).swap(bytes); +} + +pair<const Byte*, const Byte*> +Ice::OutputStream::finished() +{ + if(b.empty()) + { + return pair<const Byte*, const Byte*>(reinterpret_cast<Ice::Byte*>(0), reinterpret_cast<Ice::Byte*>(0)); + } + else + { + return pair<const Byte*, const Byte*>(&b[0], &b[0] + b.size()); + } +} + +void +Ice::OutputStream::throwEncapsulationException(const char* file, int line) +{ + throw EncapsulationException(file, line); +} + +void +Ice::OutputStream::initEncaps() +{ + if(!_currentEncaps) // Lazy initialization. + { + _currentEncaps = &_preAllocatedEncaps; + _currentEncaps->start = b.size(); + } + + if(_currentEncaps->format == Ice::DefaultFormat) + { + _currentEncaps->format = _format; + } + + if(!_currentEncaps->encoder) // Lazy initialization. + { + if(_currentEncaps->encoding == Encoding_1_0) + { + _currentEncaps->encoder = new EncapsEncoder10(this, _currentEncaps); + } + else + { + _currentEncaps->encoder = new EncapsEncoder11(this, _currentEncaps); + } + } +} + +Int +Ice::OutputStream::EncapsEncoder::registerTypeId(const string& typeId) +{ + TypeIdMap::const_iterator p = _typeIdMap.find(typeId); + if(p != _typeIdMap.end()) + { + return p->second; + } + else + { + _typeIdMap.insert(make_pair(typeId, ++_typeIdIndex)); + return -1; + } +} + +void +Ice::OutputStream::EncapsEncoder10::write(const ValuePtr& v) +{ + // + // Object references are encoded as a negative integer in 1.0. + // + if(v) + { + _stream->write(-registerObject(v)); + } + else + { + _stream->write(0); + } +} + +void +Ice::OutputStream::EncapsEncoder10::write(const UserException& v) +{ + // + // User exception with the 1.0 encoding start with a boolean + // flag that indicates whether or not the exception uses + // classes. + // + // This allows reading the pending objects even if some part of + // the exception was sliced. + // + bool usesClasses = v.__usesClasses(); + _stream->write(usesClasses); + v.__write(_stream); + if(usesClasses) + { + writePendingObjects(); + } +} + +void +Ice::OutputStream::EncapsEncoder10::startInstance(SliceType sliceType, const SlicedDataPtr&) +{ + _sliceType = sliceType; +} + +void +Ice::OutputStream::EncapsEncoder10::endInstance() +{ + if(_sliceType == ObjectSlice) + { + // + // Write the Object slice. + // + startSlice(Object::ice_staticId(), -1, true); + _stream->writeSize(0); // For compatibility with the old AFM. + endSlice(); + } + _sliceType = NoSlice; +} + +void +Ice::OutputStream::EncapsEncoder10::startSlice(const string& typeId, int, bool /*last*/) +{ + // + // For object slices, encode a boolean to indicate how the type ID + // is encoded and the type ID either as a string or index. For + // exception slices, always encode the type ID as a string. + // + if(_sliceType == ObjectSlice) + { + Int index = registerTypeId(typeId); + if(index < 0) + { + _stream->write(false); + _stream->write(typeId, false); + } + else + { + _stream->write(true); + _stream->writeSize(index); + } + } + else + { + _stream->write(typeId, false); + } + + _stream->write(Int(0)); // Placeholder for the slice length. + + _writeSlice = _stream->b.size(); +} + +void +Ice::OutputStream::EncapsEncoder10::endSlice() +{ + // + // Write the slice length. + // + Int sz = static_cast<Int>(_stream->b.size() - _writeSlice + sizeof(Int)); + Byte* dest = &(*(_stream->b.begin() + _writeSlice - sizeof(Int))); + _stream->write(sz, dest); +} + +void +Ice::OutputStream::EncapsEncoder10::writePendingObjects() +{ + while(!_toBeMarshaledMap.empty()) + { + // + // Consider the to be marshalled objects as marshalled now, + // this is necessary to avoid adding again the "to be + // marshalled objects" into _toBeMarshaledMap while writing + // objects. + // + _marshaledMap.insert(_toBeMarshaledMap.begin(), _toBeMarshaledMap.end()); + + PtrToIndexMap savedMap; + savedMap.swap(_toBeMarshaledMap); + _stream->writeSize(static_cast<Int>(savedMap.size())); + for(PtrToIndexMap::iterator p = savedMap.begin(); p != savedMap.end(); ++p) + { + // + // Ask the instance to marshal itself. Any new class + // instances that are triggered by the classes marshaled + // are added to toBeMarshaledMap. + // + _stream->write(p->second); + + try + { + p->first->ice_preMarshal(); + } + catch(const std::exception& ex) + { + Warning out(_stream->instance()->initializationData().logger); + out << "std::exception raised by ice_preMarshal:\n" << ex; + } + catch(...) + { + Warning out(_stream->instance()->initializationData().logger); + out << "unknown exception raised by ice_preMarshal"; + } + + p->first->__write(_stream); + } + } + _stream->writeSize(0); // Zero marker indicates end of sequence of sequences of instances. +} + +Int +Ice::OutputStream::EncapsEncoder10::registerObject(const ValuePtr& v) +{ + assert(v); + + // + // Look for this instance in the to-be-marshaled map. + // + PtrToIndexMap::const_iterator p = _toBeMarshaledMap.find(v); + if(p != _toBeMarshaledMap.end()) + { + return p->second; + } + + // + // Didn't find it, try the marshaled map next. + // + PtrToIndexMap::const_iterator q = _marshaledMap.find(v); + if(q != _marshaledMap.end()) + { + return q->second; + } + + // + // We haven't seen this instance previously, create a new + // index, and insert it into the to-be-marshaled map. + // + _toBeMarshaledMap.insert(make_pair(v, ++_objectIdIndex)); + return _objectIdIndex; +} + +void +Ice::OutputStream::EncapsEncoder11::write(const ValuePtr& v) +{ + if(!v) + { + _stream->writeSize(0); // Nil reference. + } + else if(_current && _encaps->format == SlicedFormat) + { + // + // If writting an object within a slice and using the sliced + // format, write an index from the object indirection + // table. The indirect object table is encoded at the end of + // each slice and is always read (even if the Slice is + // unknown). + // + PtrToIndexMap::const_iterator p = _current->indirectionMap.find(v); + if(p == _current->indirectionMap.end()) + { + _current->indirectionTable.push_back(v); + Int idx = static_cast<Int>(_current->indirectionTable.size()); // Position + 1 (0 is reserved for nil) + _current->indirectionMap.insert(make_pair(v, idx)); + _stream->writeSize(idx); + } + else + { + _stream->writeSize(p->second); + } + } + else + { + writeInstance(v); // Write the instance or a reference if already marshaled. + } +} + +void +Ice::OutputStream::EncapsEncoder11::write(const UserException& v) +{ + v.__write(_stream); +} + +void +Ice::OutputStream::EncapsEncoder11::startInstance(SliceType sliceType, const SlicedDataPtr& data) +{ + if(!_current) + { + _current = &_preAllocatedInstanceData; + } + else + { + _current = _current->next ? _current->next : new InstanceData(_current); + } + _current->sliceType = sliceType; + _current->firstSlice = true; + + if(data) + { + writeSlicedData(data); + } +} + +void +Ice::OutputStream::EncapsEncoder11::endInstance() +{ + _current = _current->previous; +} + +void +Ice::OutputStream::EncapsEncoder11::startSlice(const string& typeId, int compactId, bool last) +{ + assert(_current->indirectionTable.empty() && _current->indirectionMap.empty()); + + _current->sliceFlagsPos = _stream->b.size(); + + _current->sliceFlags = 0; + if(_encaps->format == SlicedFormat) + { + _current->sliceFlags |= FLAG_HAS_SLICE_SIZE; // Encode the slice size if using the sliced format. + } + if(last) + { + _current->sliceFlags |= FLAG_IS_LAST_SLICE; // This is the last slice. + } + + _stream->write(Byte(0)); // Placeholder for the slice flags + + // + // For object slices, encode the flag and the type ID either as a + // string or index. For exception slices, always encode the type + // ID a string. + // + if(_current->sliceType == ObjectSlice) + { + // + // Encode the type ID (only in the first slice for the compact + // encoding). + // + if(_encaps->format == SlicedFormat || _current->firstSlice) + { + if(compactId >= 0) + { + _current->sliceFlags |= FLAG_HAS_TYPE_ID_COMPACT; + _stream->writeSize(compactId); + } + else + { + Int index = registerTypeId(typeId); + if(index < 0) + { + _current->sliceFlags |= FLAG_HAS_TYPE_ID_STRING; + _stream->write(typeId, false); + } + else + { + _current->sliceFlags |= FLAG_HAS_TYPE_ID_INDEX; + _stream->writeSize(index); + } + } + } + } + else + { + _stream->write(typeId, false); + } + + if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE) + { + _stream->write(Int(0)); // Placeholder for the slice length. + } + + _current->writeSlice = _stream->b.size(); + _current->firstSlice = false; +} + +void +Ice::OutputStream::EncapsEncoder11::endSlice() +{ + // + // Write the optional member end marker if some optional members + // were encoded. Note that the optional members are encoded before + // the indirection table and are included in the slice size. + // + if(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS) + { + _stream->write(OPTIONAL_END_MARKER); + } + + // + // Write the slice length if necessary. + // + if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE) + { + Int sz = static_cast<Int>(_stream->b.size() - _current->writeSlice + sizeof(Int)); + Byte* dest = &(*(_stream->b.begin() + _current->writeSlice - sizeof(Int))); + _stream->write(sz, dest); + } + + // + // Only write the indirection table if it contains entries. + // + if(!_current->indirectionTable.empty()) + { + assert(_encaps->format == SlicedFormat); + _current->sliceFlags |= FLAG_HAS_INDIRECTION_TABLE; + + // + // Write the indirection object table. + // + _stream->writeSize(static_cast<Int>(_current->indirectionTable.size())); + ObjectList::const_iterator p; + for(p = _current->indirectionTable.begin(); p != _current->indirectionTable.end(); ++p) + { + writeInstance(*p); + } + _current->indirectionTable.clear(); + _current->indirectionMap.clear(); + } + + // + // Finally, update the slice flags. + // + Byte* dest = &(*(_stream->b.begin() + _current->sliceFlagsPos)); + *dest = _current->sliceFlags; +} + +bool +Ice::OutputStream::EncapsEncoder11::writeOpt(Ice::Int tag, Ice::OptionalFormat format) +{ + if(!_current) + { + return _stream->writeOptImpl(tag, format); + } + else + { + if(_stream->writeOptImpl(tag, format)) + { + _current->sliceFlags |= FLAG_HAS_OPTIONAL_MEMBERS; + return true; + } + else + { + return false; + } + } +} + +void +Ice::OutputStream::EncapsEncoder11::writeSlicedData(const SlicedDataPtr& slicedData) +{ + assert(slicedData); + + // + // We only remarshal preserved slices if we are using the sliced + // format. Otherwise, we ignore the preserved slices, which + // essentially "slices" the object into the most-derived type + // known by the sender. + // + if(_encaps->format != SlicedFormat) + { + return; + } + + for(SliceInfoSeq::const_iterator p = slicedData->slices.begin(); p != slicedData->slices.end(); ++p) + { + startSlice((*p)->typeId, (*p)->compactId, (*p)->isLastSlice); + + // + // Write the bytes associated with this slice. + // + _stream->writeBlob((*p)->bytes); + + if((*p)->hasOptionalMembers) + { + _current->sliceFlags |= FLAG_HAS_OPTIONAL_MEMBERS; + } + + // + // Make sure to also re-write the object indirection table. + // + _current->indirectionTable = (*p)->objects; + + endSlice(); + } +} + +void +Ice::OutputStream::EncapsEncoder11::writeInstance(const ValuePtr& v) +{ + assert(v); + + // + // If the instance was already marshaled, just write it's ID. + // + PtrToIndexMap::const_iterator q = _marshaledMap.find(v); + if(q != _marshaledMap.end()) + { + _stream->writeSize(q->second); + return; + } + + // + // We haven't seen this instance previously, create a new ID, + // insert it into the marshaled map, and write the instance. + // + _marshaledMap.insert(make_pair(v, ++_objectIdIndex)); + + try + { + v->ice_preMarshal(); + } + catch(const std::exception& ex) + { + Warning out(_stream->instance()->initializationData().logger); + out << "std::exception raised by ice_preMarshal:\n" << ex; + } + catch(...) + { + Warning out(_stream->instance()->initializationData().logger); + out << "unknown exception raised by ice_preMarshal"; + } + + _stream->writeSize(1); // Object instance marker. + v->__write(_stream); +} diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 9b7602394d6..3a5c15d7cc9 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -19,10 +19,10 @@ #include <Ice/Instance.h> #include <Ice/RouterInfo.h> #include <Ice/LocatorInfo.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> #include <Ice/ConnectionI.h> // To convert from ConnectionIPtr to ConnectionPtr in ice_getConnection(). -#include <Ice/Stream.h> #include <Ice/ImplicitContextI.h> using namespace std; @@ -92,16 +92,16 @@ Ice::ObjectPrx::ice_isA_async(const string& typeId, const ::Ice::Context& context) { return TwowayClosureCallback::invoke(ice_isA_name, shared_from_this(), OperationMode::Nonmutating, DefaultFormat, - [&typeId](IceInternal::BasicStream* os) + [&typeId](Ice::OutputStream* os) { os->write(typeId); }, false, - [response](IceInternal::BasicStream* is) + [response](Ice::InputStream* is) { bool ret; is->read(ret); - is->endReadEncaps(); + is->endEncapsulation(); if(response) { response(ret); @@ -192,11 +192,11 @@ Ice::ObjectPrx::ice_id_async(function<void (string)> response, { return TwowayClosureCallback::invoke( ice_id_name, shared_from_this(), OperationMode::Nonmutating, DefaultFormat, nullptr, false, - [response](IceInternal::BasicStream* is) + [response](Ice::InputStream* is) { string ret; is->read(ret); - is->endReadEncaps(); + is->endEncapsulation(); if(response) { response(move(ret)); @@ -231,11 +231,11 @@ Ice::ObjectPrx::ice_ids_async(function<void (vector<string>)> response, { return TwowayClosureCallback::invoke( ice_ids_name, shared_from_this(), OperationMode::Nonmutating, DefaultFormat, nullptr, false, - [response](IceInternal::BasicStream* is) + [response](Ice::InputStream* is) { vector<string> ret; is->read(ret); - is->endReadEncaps(); + is->endEncapsulation(); if(response) { response(move(ret)); @@ -832,7 +832,7 @@ IceProxy::Ice::Object::ice_isA(const string& typeId, const Context& context) Outgoing __og(this, ice_isA_name, ::Ice::Nonmutating, context); try { - BasicStream* __os = __og.startWriteParams(DefaultFormat); + OutputStream* __os = __og.startWriteParams(DefaultFormat); __os->write(typeId, false); __og.endWriteParams(); } @@ -852,7 +852,7 @@ IceProxy::Ice::Object::ice_isA(const string& typeId, const Context& context) } } bool __ret; - BasicStream* __is = __og.startReadParams(); + InputStream* __is = __og.startReadParams(); __is->read(__ret); __og.endReadParams(); return __ret; @@ -869,7 +869,7 @@ IceProxy::Ice::Object::__begin_ice_isA(const string& typeId, try { __result->prepare(ice_isA_name, Nonmutating, ctx); - IceInternal::BasicStream* __os = __result->startWriteParams(DefaultFormat); + ::Ice::OutputStream* __os = __result->startWriteParams(DefaultFormat); __os->write(typeId); __result->endWriteParams(); __result->invoke(); @@ -898,7 +898,7 @@ IceProxy::Ice::Object::end_ice_isA(const AsyncResultPtr& __result) } } bool __ret; - IceInternal::BasicStream* __is = __result->__startReadParams(); + ::Ice::InputStream* __is = __result->__startReadParams(); __is->read(__ret); __result->__endReadParams(); return __ret; @@ -970,7 +970,7 @@ IceProxy::Ice::Object::ice_ids(const Context& context) } } vector<string> __ret; - BasicStream* __is = __og.startReadParams(); + InputStream* __is = __og.startReadParams(); __is->read(__ret, false); __og.endReadParams(); return __ret; @@ -994,7 +994,7 @@ IceProxy::Ice::Object::ice_id(const Context& context) } } string __ret; - BasicStream* __is = __og.startReadParams(); + InputStream* __is = __og.startReadParams(); __is->read(__ret, false); __og.endReadParams(); return __ret; @@ -1037,7 +1037,7 @@ IceProxy::Ice::Object::end_ice_ids(const AsyncResultPtr& __result) } } vector<string> __ret; - IceInternal::BasicStream* __is = __result->__startReadParams(); + ::Ice::InputStream* __is = __result->__startReadParams(); __is->read(__ret); __result->__endReadParams(); return __ret; @@ -1080,7 +1080,7 @@ IceProxy::Ice::Object::end_ice_id(const AsyncResultPtr& __result) } } string __ret; - IceInternal::BasicStream* __is = __result->__startReadParams(); + ::Ice::InputStream* __is = __result->__startReadParams(); __is->read(__ret); __result->__endReadParams(); return __ret; @@ -1344,18 +1344,6 @@ IceProxy::Ice::Object::__checkTwowayOnly(const string& name) const } } -void -Ice::ice_writeObjectPrx(const OutputStreamPtr& out, const ObjectPrxPtr& v) -{ - out->write(v); -} - -void -Ice::ice_readObjectPrx(const InputStreamPtr& in, ObjectPrxPtr& v) -{ - in->read(v); -} - #endif #ifdef ICE_CPP11_MAPPING @@ -2120,6 +2108,13 @@ ICE_OBJECT_PRX::__hash() const return _reference->hash(); } +void +ICE_OBJECT_PRX::__write(OutputStream& os) const +{ + os.write(__reference()->getIdentity()); + __reference()->streamWrite(&os); +} + bool Ice::proxyIdentityLess(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs) { diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp index 0b69caf3d82..dd15ae5b21d 100644 --- a/cpp/src/Ice/ProxyFactory.cpp +++ b/cpp/src/Ice/ProxyFactory.cpp @@ -15,7 +15,8 @@ #include <Ice/ReferenceFactory.h> #include <Ice/LocatorInfo.h> #include <Ice/RouterInfo.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/Properties.h> #include <Ice/LoggerUtil.h> #include <Ice/TraceLevels.h> @@ -70,7 +71,7 @@ IceInternal::ProxyFactory::proxyToProperty(const ObjectPrxPtr& proxy, const stri } ObjectPrxPtr -IceInternal::ProxyFactory::streamToProxy(BasicStream* s) const +IceInternal::ProxyFactory::streamToProxy(InputStream* s) const { Identity ident; s->read(ident); @@ -79,21 +80,6 @@ IceInternal::ProxyFactory::streamToProxy(BasicStream* s) const return referenceToProxy(ref); } -void -IceInternal::ProxyFactory::proxyToStream(const ObjectPrxPtr& proxy, BasicStream* s) const -{ - if(proxy) - { - s->write(proxy->__reference()->getIdentity()); - proxy->__reference()->streamWrite(s); - } - else - { - Identity ident; - s->write(ident); - } -} - ObjectPrxPtr IceInternal::ProxyFactory::referenceToProxy(const ReferencePtr& ref) const { diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h index 18a4ae83552..1478facc01b 100644 --- a/cpp/src/Ice/ProxyFactory.h +++ b/cpp/src/Ice/ProxyFactory.h @@ -20,10 +20,16 @@ #include <Ice/OutgoingAsyncF.h> #include <Ice/Properties.h> -namespace IceInternal +namespace Ice { -class BasicStream; +class OutputStream; +class InputStream; + +} + +namespace IceInternal +{ class ProxyFactory : public IceUtil::Shared { @@ -35,8 +41,7 @@ public: Ice::ObjectPrxPtr propertyToProxy(const std::string&) const; Ice::PropertyDict proxyToProperty(const Ice::ObjectPrxPtr&, const std::string&) const; - Ice::ObjectPrxPtr streamToProxy(BasicStream*) const; - void proxyToStream(const Ice::ObjectPrxPtr&, BasicStream*) const; + Ice::ObjectPrxPtr streamToProxy(Ice::InputStream*) const; Ice::ObjectPrxPtr referenceToProxy(const ReferencePtr&) const; diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index f002b8356f6..ea872f3562a 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -13,7 +13,7 @@ #include <Ice/Instance.h> #include <Ice/EndpointI.h> #include <Ice/OpaqueEndpointI.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> #include <Ice/RouterInfo.h> #include <Ice/Router.h> #include <Ice/LocatorInfo.h> @@ -187,7 +187,7 @@ Reference::hash() const } void -IceInternal::Reference::streamWrite(BasicStream* s) const +IceInternal::Reference::streamWrite(OutputStream* s) const { // // Don't write the identity here. Operations calling streamWrite @@ -210,7 +210,7 @@ IceInternal::Reference::streamWrite(BasicStream* s) const s->write(_secure); - if(s->getWriteEncoding() != Ice::Encoding_1_0) + if(s->getEncoding() != Ice::Encoding_1_0) { s->write(_protocol); s->write(_encoding); @@ -731,7 +731,7 @@ IceInternal::FixedReference::isWellKnown() const } void -IceInternal::FixedReference::streamWrite(BasicStream*) const +IceInternal::FixedReference::streamWrite(OutputStream*) const { throw FixedProxyException(__FILE__, __LINE__); } @@ -1182,7 +1182,7 @@ IceInternal::RoutableReference::isWellKnown() const } void -IceInternal::RoutableReference::streamWrite(BasicStream* s) const +IceInternal::RoutableReference::streamWrite(OutputStream* s) const { Reference::streamWrite(s); diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h index 23baff439b9..e17396eaa7d 100644 --- a/cpp/src/Ice/Reference.h +++ b/cpp/src/Ice/Reference.h @@ -27,10 +27,15 @@ #include <Ice/Protocol.h> #include <Ice/Properties.h> -namespace IceInternal +namespace Ice { -class BasicStream; +class OutputStream; + +} + +namespace IceInternal +{ class Reference : public IceUtil::Shared { @@ -120,7 +125,7 @@ public: // // Marshal the reference. // - virtual void streamWrite(BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; // // Convert the reference to its string form. @@ -207,7 +212,7 @@ public: virtual bool isIndirect() const; virtual bool isWellKnown() const; - virtual void streamWrite(BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; virtual std::string toString() const; virtual Ice::PropertyDict toProperty(const std::string&) const; @@ -265,7 +270,7 @@ public: virtual bool isIndirect() const; virtual bool isWellKnown() const; - virtual void streamWrite(BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; virtual std::string toString() const; virtual Ice::PropertyDict toProperty(const std::string&) const; diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp index fd6a833311d..c2ee1ad2452 100644 --- a/cpp/src/Ice/ReferenceFactory.cpp +++ b/cpp/src/Ice/ReferenceFactory.cpp @@ -20,7 +20,7 @@ #include <Ice/LocatorInfo.h> #include <Ice/Locator.h> #include <Ice/LoggerUtil.h> -#include <Ice/BasicStream.h> +#include <Ice/InputStream.h> #include <Ice/Properties.h> #include <Ice/DefaultsAndOverrides.h> #include <Ice/PropertyNames.h> @@ -586,7 +586,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP } ReferencePtr -IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) +IceInternal::ReferenceFactory::create(const Identity& ident, InputStream* s) { // // Don't read the identity here. Operations calling this @@ -626,7 +626,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) Ice::ProtocolVersion protocol; Ice::EncodingVersion encoding; - if(s->getReadEncoding() != Ice::Encoding_1_0) + if(s->getEncoding() != Ice::Encoding_1_0) { s->read(protocol); s->read(encoding); diff --git a/cpp/src/Ice/ReferenceFactory.h b/cpp/src/Ice/ReferenceFactory.h index 12c396ee440..c143f833199 100644 --- a/cpp/src/Ice/ReferenceFactory.h +++ b/cpp/src/Ice/ReferenceFactory.h @@ -52,7 +52,7 @@ public: // // Create a reference by unmarshaling it from a stream. // - ReferencePtr create(const ::Ice::Identity&, BasicStream*); + ReferencePtr create(const ::Ice::Identity&, Ice::InputStream*); ReferenceFactoryPtr setDefaultRouter(const ::Ice::RouterPrxPtr&); ::Ice::RouterPrxPtr getDefaultRouter() const; diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h index c5d43370141..5859f013d58 100644 --- a/cpp/src/Ice/RequestHandler.h +++ b/cpp/src/Ice/RequestHandler.h @@ -29,8 +29,6 @@ class LocalException; namespace IceInternal { -class BasicStream; - class OutgoingBase; class ProxyOutgoingBase; diff --git a/cpp/src/Ice/ResponseHandler.h b/cpp/src/Ice/ResponseHandler.h index 36b12b1d1fe..724f784fc59 100644 --- a/cpp/src/Ice/ResponseHandler.h +++ b/cpp/src/Ice/ResponseHandler.h @@ -18,16 +18,21 @@ #include <Ice/ResponseHandlerF.h> #include <Ice/VirtualShared.h> -namespace IceInternal +namespace Ice { -class BasicStream; +class OutputStream; + +} + +namespace IceInternal +{ class ResponseHandler : public virtual ICE_SHARED { public: - virtual void sendResponse(Ice::Int, BasicStream*, Ice::Byte, bool) = 0; + virtual void sendResponse(Ice::Int, Ice::OutputStream*, Ice::Byte, bool) = 0; virtual void sendNoResponse() = 0; virtual bool systemException(Ice::Int, const Ice::SystemException&, bool) = 0; virtual void invokeException(Ice::Int, const Ice::LocalException&, int, bool) = 0; diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp index d2e9b89d388..ad39ff4b9c0 100644 --- a/cpp/src/Ice/SlicedData.cpp +++ b/cpp/src/Ice/SlicedData.cpp @@ -8,7 +8,8 @@ // ********************************************************************** #include <Ice/SlicedData.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> using namespace std; using namespace Ice; @@ -71,15 +72,15 @@ Ice::UnknownSlicedObject::getSlicedData() const } void -Ice::UnknownSlicedObject::__write(IceInternal::BasicStream* __os) const +Ice::UnknownSlicedObject::__write(Ice::OutputStream* __os) const { - __os->startWriteObject(_slicedData); - __os->endWriteObject(); + __os->startObject(_slicedData); + __os->endObject(); } void -Ice::UnknownSlicedObject::__read(IceInternal::BasicStream* __is) +Ice::UnknownSlicedObject::__read(Ice::InputStream* __is) { - __is->startReadObject(); - _slicedData = __is->endReadObject(true); + __is->startObject(); + _slicedData = __is->endObject(true); } diff --git a/cpp/src/Ice/Stream.cpp b/cpp/src/Ice/Stream.cpp deleted file mode 100644 index 603644fd82a..00000000000 --- a/cpp/src/Ice/Stream.cpp +++ /dev/null @@ -1,53 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <Ice/Stream.h> - -using namespace std; -using namespace Ice; -using namespace IceInternal; - -IceUtil::Shared* Ice::upCast(InputStream* p) { return p; } -IceUtil::Shared* Ice::upCast(OutputStream* p) { return p; } - -void -Ice::UserExceptionReader::__writeImpl(::IceInternal::BasicStream*) const -{ - assert(false); // Should never be called. -} - -void -Ice::UserExceptionReader::__readImpl(::IceInternal::BasicStream*) -{ - assert(false); // Should never be called. -} - -bool -Ice::UserExceptionReader::__usesClasses() const -{ - return usesClasses(); -} - -void -Ice::UserExceptionWriter::__writeImpl(::IceInternal::BasicStream*) const -{ - assert(false); // Should never be called. -} - -void -Ice::UserExceptionWriter::__readImpl(::IceInternal::BasicStream*) -{ - assert(false); // Should never be called. -} - -bool -Ice::UserExceptionWriter::__usesClasses() const -{ - return usesClasses(); -} diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp deleted file mode 100644 index a44f891972b..00000000000 --- a/cpp/src/Ice/StreamI.cpp +++ /dev/null @@ -1,832 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <Ice/StreamI.h> -#include <Ice/Instance.h> -#include <Ice/DefaultsAndOverrides.h> -#include <Ice/Initialize.h> -#include <Ice/LocalException.h> -#include <Ice/UserExceptionFactory.h> - -using namespace std; -using namespace Ice; -using namespace IceInternal; - -namespace -{ - -// -// This class implements the internal interface UserExceptionFactory and delegates to -// the user-supplied instance of UserExceptionReaderFactory. -// -class UserExceptionFactoryI : public IceInternal::UserExceptionFactory -{ -public: - - UserExceptionFactoryI(const UserExceptionReaderFactoryPtr& factory) : - _factory(factory) - { - } - - virtual void createAndThrow(const string& id) - { - _factory->createAndThrow(id); - } - -private: - - const UserExceptionReaderFactoryPtr _factory; -}; - -} - -// -// UserExceptionReader -// -UserExceptionReader::UserExceptionReader(const CommunicatorPtr& communicator) : - _communicator(communicator) -{ -} - -UserExceptionReader::~UserExceptionReader() throw() -{ -} - -void -UserExceptionReader::__write(BasicStream*) const -{ - assert(false); -} - -void -UserExceptionReader::__read(BasicStream* is) -{ - InputStreamI* stream = reinterpret_cast<InputStreamI*>(is->closure()); - assert(stream); - read(stream); -} - -// -// InputStreamI -// -InputStreamI::InputStreamI(const CommunicatorPtr& communicator, const pair<const Byte*, const Byte*>& data, - bool copyData) : - _communicator(communicator), - _closure(0) -{ - Instance* instance = getInstance(communicator).get(); - initialize(instance, data, instance->defaultsAndOverrides()->defaultEncoding, copyData); -} - -InputStreamI::InputStreamI(const CommunicatorPtr& communicator, const pair<const Byte*, const Byte*>& data, - const EncodingVersion& v, bool copyData) : - _communicator(communicator), - _closure(0) -{ - initialize(getInstance(communicator).get(), data, v, copyData); -} - -InputStreamI::~InputStreamI() -{ - delete _is; -} - -CommunicatorPtr -InputStreamI::communicator() const -{ - return _communicator; -} - -void -InputStreamI::sliceObjects(bool b) -{ - _is->sliceObjects(b); -} - -Int -InputStreamI::readSize() -{ - return _is->readSize(); -} - -Int -InputStreamI::readAndCheckSeqSize(int minSize) -{ - return _is->readAndCheckSeqSize(minSize); -} - -ObjectPrxPtr -InputStreamI::readProxy() -{ - ObjectPrxPtr v; - _is->read(v); - return v; -} - -namespace -{ - -void -patchObject(void* addr, const ValuePtr& v) -{ - ReadObjectCallback* cb = static_cast<ReadObjectCallback*>(addr); - assert(cb); - cb->invoke(v); -} - -} - -void -InputStreamI::readObject(const ReadObjectCallbackPtr& cb) -{ - _callbacks.push_back(cb); // Keep reference to callback. - _is->read(patchObject, cb.get()); -} - -void -InputStreamI::read(bool& v) -{ - _is->read(v); -} - -void -InputStreamI::read(Byte& v) -{ - _is->read(v); -} - -void -InputStreamI::read(Short& v) -{ - _is->read(v); -} - -void -InputStreamI::read(Int& v) -{ - _is->read(v); -} - -void -InputStreamI::read(Long& v) -{ - _is->read(v); -} - -void -InputStreamI::read(Float& v) -{ - _is->read(v); -} - -void -InputStreamI::read(Double& v) -{ - _is->read(v); -} - -void -InputStreamI::read(string& v, bool convert) -{ - _is->read(v, convert); -} - -void -InputStreamI::read(const char*& vdata, size_t& vsize) -{ - _is->read(vdata, vsize); -} - -void -InputStreamI::read(const char*& vdata, size_t& vsize, string& holder) -{ - _is->read(vdata, vsize, holder); -} - -void -InputStreamI::read(vector<string>& v, bool convert) -{ - _is->read(v, convert); -} - -void -InputStreamI::read(wstring& v) -{ - _is->read(v); -} - -void -InputStreamI::read(vector<bool>& v) -{ - _is->read(v); -} - -void -InputStreamI::read(pair<const bool*, const bool*>& p, ::IceUtil::ScopedArray<bool>& result) -{ - _is->read(p, result); -} - -void -InputStreamI::read(pair<const Byte*, const Byte*>& p) -{ - _is->read(p); -} -void -InputStreamI::read(pair<const Short*, const Short*>& p, ::IceUtil::ScopedArray<Short>& result) -{ - _is->read(p, result); -} - -void -InputStreamI::read(pair<const Int*, const Int*>& p, ::IceUtil::ScopedArray<Int>& result) -{ - _is->read(p, result); -} - -void -InputStreamI::read(pair<const Long*, const Long*>& p, ::IceUtil::ScopedArray<Long>& result) -{ - _is->read(p, result); -} - -void -InputStreamI::read(pair<const Float*, const Float*>& p, ::IceUtil::ScopedArray<Float>& result) -{ - _is->read(p, result); -} - -void -InputStreamI::read(pair<const Double*, const Double*>& p, ::IceUtil::ScopedArray<Double>& result) -{ - _is->read(p, result); -} - -bool -InputStreamI::readOptional(Int tag, OptionalFormat format) -{ - return _is->readOpt(tag, format); -} - -void -InputStreamI::throwException() -{ - _is->throwException(); -} - -void -InputStreamI::throwException(const UserExceptionReaderFactoryPtr& factory) -{ - UserExceptionFactoryPtr del = new UserExceptionFactoryI(factory); - _is->throwException(del); -} - -void -InputStreamI::startObject() -{ - _is->startReadObject(); -} - -SlicedDataPtr -InputStreamI::endObject(bool preserve) -{ - return _is->endReadObject(preserve); -} - -void -InputStreamI::startException() -{ - _is->startReadException(); -} - -SlicedDataPtr -InputStreamI::endException(bool preserve) -{ - return _is->endReadException(preserve); -} - -string -InputStreamI::startSlice() -{ - return _is->startReadSlice(); -} - -void -InputStreamI::endSlice() -{ - _is->endReadSlice(); -} - -void -InputStreamI::skipSlice() -{ - _is->skipSlice(); -} - -EncodingVersion -InputStreamI::startEncapsulation() -{ - return _is->startReadEncaps(); -} - -void -InputStreamI::endEncapsulation() -{ - _is->endReadEncapsChecked(); -} - -EncodingVersion -InputStreamI::skipEncapsulation() -{ - return _is->skipEncaps(); -} - -EncodingVersion -InputStreamI::getEncoding() const -{ - return _is->getReadEncoding(); -} - -void -InputStreamI::readPendingObjects() -{ - _is->readPendingObjects(); -} - -InputStream::size_type -InputStreamI::pos() -{ - return _is->i - _is->b.begin(); -} - -void -InputStreamI::rewind() -{ - _is->clear(); - _is->i = _is->b.begin(); -} - -void -InputStreamI::skip(Int sz) -{ - _is->skip(sz); -} - -void -InputStreamI::skipSize() -{ - _is->skipSize(); -} - -void -InputStreamI::closure(void* p) -{ - _closure = p; -} - -void* -InputStreamI::closure() const -{ - return _closure; -} - -void -InputStreamI::initialize(Instance* instance, const pair<const Byte*, const Byte*>& buf, const EncodingVersion& v, - bool copyData) -{ - if(copyData) - { - _is = new BasicStream(instance, v); - _is->writeBlob(buf.first, buf.second - buf.first); - _is->i = _is->b.begin(); - } - else - { - _is = new BasicStream(instance, v, buf.first, buf.second); - } - _is->closure(this); -} - -// -// OutputStreamI -// -OutputStreamI::OutputStreamI(const CommunicatorPtr& communicator) : - _communicator(communicator), _own(true) -{ - Instance* instance = getInstance(communicator).get(); - _os = new BasicStream(instance, instance->defaultsAndOverrides()->defaultEncoding); - _os->closure(this); -} - -OutputStreamI::OutputStreamI(const CommunicatorPtr& communicator, const EncodingVersion& v) : - _communicator(communicator), _own(true) -{ - Instance* instance = getInstance(communicator).get(); - _os = new BasicStream(instance, v); - _os->closure(this); -} - -OutputStreamI::OutputStreamI(const CommunicatorPtr& communicator, BasicStream* os) : - _communicator(communicator), _os(os), _own(false) -{ - assert(os); - _os->closure(this); -} - -OutputStreamI::~OutputStreamI() -{ - if(_own) - { - delete _os; - } -} - -CommunicatorPtr -OutputStreamI::communicator() const -{ - return _communicator; -} - -void -OutputStreamI::writeObject(const ValuePtr& v) -{ - _os->write(v); -} - -void -OutputStreamI::writeException(const UserException& v) -{ - _os->write(v); -} - -void -OutputStreamI::writeProxy(const ObjectPrxPtr& v) -{ - _os->write(v); -} - -void -OutputStreamI::writeSize(Int sz) -{ - if(sz < 0) - { - throw MarshalException(__FILE__, __LINE__); - } - - _os->writeSize(sz); -} - -void -OutputStreamI::write(bool v) -{ - _os->write(v); -} - -void -OutputStreamI::write(Byte v) -{ - _os->write(v); -} - -void -OutputStreamI::write(Short v) -{ - _os->write(v); -} - -void -OutputStreamI::write(Int v) -{ - _os->write(v); -} - -void -OutputStreamI::write(Long v) -{ - _os->write(v); -} - -void -OutputStreamI::write(Float v) -{ - _os->write(v); -} - -void -OutputStreamI::write(Double v) -{ - _os->write(v); -} - -void -OutputStreamI::write(const string& v, bool convert) -{ - _os->write(v, convert); -} - -void -OutputStreamI::write(const char* vdata, size_t vsize, bool convert) -{ - _os->write(vdata, vsize, convert); -} - -void -OutputStreamI::write(const char* v, bool convert) -{ - _os->write(v, strlen(v), convert); -} - -void -OutputStreamI::write(const vector<string>& v, bool convert) -{ - if(v.size() == 0) - { - _os->writeSize(0); - } - else - { - _os->write(&v[0], &v[0] + v.size(), convert); - } -} - -void -OutputStreamI::write(const wstring& v) -{ - _os->write(v); -} - -void -OutputStreamI::write(const vector<bool>& v) -{ - _os->write(v); -} - -void -OutputStreamI::write(const bool* begin, const bool* end) -{ - _os->write(begin, end); -} - -void -OutputStreamI::write(const Byte* begin, const Byte* end) -{ - _os->write(begin, end); -} - -void -OutputStreamI::write(const Short* begin, const Short* end) -{ - _os->write(begin, end); -} - -void -OutputStreamI::write(const Int* begin, const Int* end) -{ - _os->write(begin, end); -} - -void -OutputStreamI::write(const Long* begin, const Long* end) -{ - _os->write(begin, end); -} - -void -OutputStreamI::write(const Float* begin, const Float* end) -{ - _os->write(begin, end); -} - -void -OutputStreamI::write(const Double* begin, const Double* end) -{ - _os->write(begin, end); -} - -bool -OutputStreamI::writeOptional(Int tag, OptionalFormat format) -{ - return _os->writeOpt(tag, format); -} - -void -OutputStreamI::startObject(const SlicedDataPtr& slicedData) -{ - _os->startWriteObject(slicedData); -} - -void -OutputStreamI::endObject() -{ - _os->endWriteObject(); -} - -void -OutputStreamI::startException(const SlicedDataPtr& slicedData) -{ - _os->startWriteException(slicedData); -} - -void -OutputStreamI::endException() -{ - _os->endWriteException(); -} - -void -OutputStreamI::startSlice(const string& typeId, int compactId, bool lastSlice) -{ - _os->startWriteSlice(typeId, compactId, lastSlice); -} - -void -OutputStreamI::endSlice() -{ - _os->endWriteSlice(); -} - -void -OutputStreamI::startEncapsulation(const EncodingVersion& version, FormatType format) -{ - _os->startWriteEncaps(version, format); -} - -void -OutputStreamI::startEncapsulation() -{ - _os->startWriteEncaps(); -} - -void -OutputStreamI::endEncapsulation() -{ - _os->endWriteEncapsChecked(); -} - -EncodingVersion -OutputStreamI::getEncoding() const -{ - return _os->getWriteEncoding(); -} - -void -OutputStreamI::writePendingObjects() -{ - _os->writePendingObjects(); -} - -void -OutputStreamI::finished(vector<Byte>& bytes) -{ - vector<Byte>(_os->b.begin(), _os->b.end()).swap(bytes); -} - -pair<const Byte*, const Byte*> -OutputStreamI::finished() -{ - if(_os->b.empty()) - { - return pair<const Byte*, const Byte*>(reinterpret_cast<Ice::Byte*>(0), reinterpret_cast<Ice::Byte*>(0)); - } - else - { - return pair<const Byte*, const Byte*>(&_os->b[0], &_os->b[0] + _os->b.size()); - } -} - -void -OutputStreamI::reset(bool clearBuffer) -{ - _os->clear(); - - if(clearBuffer) - { - _os->b.clear(); - } - else - { - _os->b.reset(); - } - - _os->i = _os->b.begin(); -} - -OutputStream::size_type -OutputStreamI::pos() -{ - return _os->b.size(); -} - -void -OutputStreamI::rewrite(Int sz, size_type p) -{ - _os->rewrite(sz, p); -} - -OutputStream::size_type -OutputStreamI::startSize() -{ - return _os->startSize(); -} - -void -OutputStreamI::endSize(OutputStream::size_type pos) -{ - _os->endSize(pos); -} - -// -// ObjectReader -// -void -ObjectReader::__write(BasicStream*) const -{ - assert(false); -} - -void -ObjectReader::__read(BasicStream* is) -{ - InputStreamI* stream = reinterpret_cast<InputStreamI*>(is->closure()); - assert(stream); - read(stream); -} - -void -ObjectReader::__write(const OutputStreamPtr&) const -{ - assert(false); -} - -void -ObjectReader::__read(const InputStreamPtr&) -{ - assert(false); -} - -// -// ObjectWriter -// -void -ObjectWriter::__write(BasicStream* os) const -{ - OutputStreamI* stream = reinterpret_cast<OutputStreamI*>(os->closure()); - assert(stream); - write(stream); -} - -void -ObjectWriter::__read(BasicStream*) -{ - assert(false); -} - -void -ObjectWriter::__write(const OutputStreamPtr&) const -{ - assert(false); -} - -void -ObjectWriter::__read(const InputStreamPtr&) -{ - assert(false); -} - -// -// UserExceptionWriter -// -UserExceptionWriter::UserExceptionWriter(const CommunicatorPtr& communicator) : - _communicator(communicator) -{ -} - -UserExceptionWriter::~UserExceptionWriter() throw() -{ -} - -void -UserExceptionWriter::__write(BasicStream* os) const -{ - OutputStreamI* stream = reinterpret_cast<OutputStreamI*>(os->closure()); - if(!stream) - { - // - // Required for IcePy usage - // - stream = new OutputStreamI(_communicator, os); - } - write(stream); -} - -void -UserExceptionWriter::__read(BasicStream*) -{ - assert(false); -} diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h deleted file mode 100644 index d2b8fad2c89..00000000000 --- a/cpp/src/Ice/StreamI.h +++ /dev/null @@ -1,198 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef ICE_STREAM_I_H -#define ICE_STREAM_I_H - -#include <Ice/Stream.h> - -namespace IceInternal -{ - -// Forward declaration. -class BasicStream; - -}; - -namespace Ice -{ - -// -// Implement InputStream as a wrapper around BasicStream. -// -class InputStreamI : public InputStream -{ -public: - - InputStreamI(const CommunicatorPtr&, const std::pair<const Byte*, const Byte*>&, bool); - InputStreamI(const CommunicatorPtr&, const std::pair<const Byte*, const Byte*>&, const EncodingVersion&, bool); - virtual ~InputStreamI(); - - virtual CommunicatorPtr communicator() const; - - virtual void sliceObjects(bool); - - virtual Int readSize(); - virtual Int readAndCheckSeqSize(int); - - virtual ObjectPrxPtr readProxy(); - virtual void readObject(const ReadObjectCallbackPtr&); - - virtual void throwException(); - virtual void throwException(const UserExceptionReaderFactoryPtr&); - - virtual void startObject(); - virtual SlicedDataPtr endObject(bool); - - virtual void startException(); - virtual SlicedDataPtr endException(bool); - - virtual std::string startSlice(); - virtual void endSlice(); - virtual void skipSlice(); - - virtual EncodingVersion startEncapsulation(); - virtual void endEncapsulation(); - virtual EncodingVersion skipEncapsulation(); - - virtual EncodingVersion getEncoding() const; - - virtual void readPendingObjects(); - - virtual size_type pos(); - virtual void rewind(); - - virtual void skip(Int); - virtual void skipSize(); - - 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(const char*&, size_t&); - virtual void read(const char*&, size_t&, std::string&); - virtual void read(std::vector<std::string>&, bool); - 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>&); - virtual void read(std::pair<const Int*, const Int*>&, ::IceUtil::ScopedArray<Int>&); - virtual void read(std::pair<const Long*, const Long*>&, ::IceUtil::ScopedArray<Long>&); - virtual void read(std::pair<const Float*, const Float*>&, ::IceUtil::ScopedArray<Float>&); - virtual void read(std::pair<const Double*, const Double*>&, ::IceUtil::ScopedArray<Double>&); - -#ifdef __SUNPRO_CC - using InputStream::read; -#endif - - virtual bool readOptional(Int, OptionalFormat); - - virtual void closure(void*); - virtual void* closure() const; - -private: - - void initialize(IceInternal::Instance*, const std::pair<const Byte*, const Byte*>&, const EncodingVersion&, bool); - - const CommunicatorPtr _communicator; - IceInternal::BasicStream* _is; - std::vector< ReadObjectCallbackPtr > _callbacks; - void* _closure; -}; - -// -// Implement OutputStream as a wrapper around BasicStream. -// -class OutputStreamI : public OutputStream -{ -public: - - OutputStreamI(const CommunicatorPtr&); - OutputStreamI(const CommunicatorPtr&, const EncodingVersion&); - OutputStreamI(const CommunicatorPtr&, IceInternal::BasicStream*); - virtual ~OutputStreamI(); - - virtual CommunicatorPtr communicator() const; - - virtual void writeObject(const ValuePtr&); - virtual void writeException(const UserException&); - virtual void writeProxy(const ObjectPrxPtr&); - - virtual void writeSize(Int); - - virtual void write(bool); - virtual void write(Byte); - virtual void write(Short); - virtual void write(Int); - virtual void write(Long); - virtual void write(Float); - virtual void write(Double); - virtual void write(const std::string&, bool = true); - virtual void write(const char*, size_t, bool = true); - virtual void write(const std::vector<std::string>&, bool); - 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*); - virtual void write(const Int*, const Int*); - virtual void write(const Long*, const Long*); - virtual void write(const Float*, const Float*); - virtual void write(const Double*, const Double*); - -#ifdef __SUNPRO_CC - using OutputStream::write; -#endif - - virtual bool writeOptional(Int, OptionalFormat); - - virtual void startObject(const SlicedDataPtr&); - virtual void endObject(); - - virtual void startException(const SlicedDataPtr&); - virtual void endException(); - - virtual void startSlice(const std::string&, int, bool); - virtual void endSlice(); - - virtual void startEncapsulation(const EncodingVersion&, FormatType); - virtual void startEncapsulation(); - virtual void endEncapsulation(); - - virtual EncodingVersion getEncoding() const; - - virtual void writePendingObjects(); - - virtual void finished(std::vector< Byte >&); - virtual std::pair<const Byte*, const Byte*> finished(); - - virtual void reset(bool); - - virtual size_type pos(); - virtual void rewrite(Int, size_type); - - virtual size_type startSize(); - virtual void endSize(size_type pos); - -private: - - const CommunicatorPtr _communicator; - IceInternal::BasicStream* _os; - const bool _own; -}; - -} - -#endif diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp index b29f349d679..234ec967c81 100644 --- a/cpp/src/Ice/TcpEndpointI.cpp +++ b/cpp/src/Ice/TcpEndpointI.cpp @@ -12,7 +12,8 @@ #include <Ice/TcpAcceptor.h> #include <Ice/TcpConnector.h> #include <Ice/TcpTransceiver.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> #include <Ice/ProtocolInstance.h> #include <Ice/HashUtil.h> @@ -52,7 +53,7 @@ IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance) : { } -IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance, BasicStream* s) : +IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance, InputStream* s) : IPEndpointI(instance, s), _timeout(-1), _compress(false) @@ -253,7 +254,7 @@ IceInternal::TcpEndpointI::operator<(const LocalObject& r) const } void -IceInternal::TcpEndpointI::streamWriteImpl(BasicStream* s) const +IceInternal::TcpEndpointI::streamWriteImpl(OutputStream* s) const { IPEndpointI::streamWriteImpl(s); s->write(_timeout); @@ -372,7 +373,7 @@ IceInternal::TcpEndpointFactory::create(vector<string>& args, bool oaEndpoint) c } EndpointIPtr -IceInternal::TcpEndpointFactory::read(BasicStream* s) const +IceInternal::TcpEndpointFactory::read(InputStream* s) const { return ICE_MAKE_SHARED(TcpEndpointI, _instance, s); } diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h index 911b22c62fa..d2309860c94 100644 --- a/cpp/src/Ice/TcpEndpointI.h +++ b/cpp/src/Ice/TcpEndpointI.h @@ -26,7 +26,7 @@ public: TcpEndpointI(const ProtocolInstancePtr&, const std::string&, Ice::Int, const Address&, Ice::Int, const std::string&, bool); TcpEndpointI(const ProtocolInstancePtr&); - TcpEndpointI(const ProtocolInstancePtr&, BasicStream*); + TcpEndpointI(const ProtocolInstancePtr&, Ice::InputStream*); virtual Ice::EndpointInfoPtr getInfo() const; virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const; @@ -54,7 +54,7 @@ public: protected: - virtual void streamWriteImpl(BasicStream*) const; + virtual void streamWriteImpl(Ice::OutputStream*) const; virtual void hashInit(Ice::Int&) const; virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const; virtual bool checkOption(const std::string&, const std::string&, const std::string&); @@ -81,7 +81,7 @@ public: virtual Ice::Short type() const; virtual std::string protocol() const; virtual EndpointIPtr create(std::vector<std::string>&, bool) const; - virtual EndpointIPtr read(BasicStream*) const; + virtual EndpointIPtr read(Ice::InputStream*) const; virtual void destroy(); virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const; diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h index 6469d48c7b7..56c1a008990 100644 --- a/cpp/src/Ice/ThreadPool.h +++ b/cpp/src/Ice/ThreadPool.h @@ -23,7 +23,7 @@ #include <Ice/PropertiesF.h> #include <Ice/EventHandler.h> #include <Ice/Selector.h> -#include <Ice/BasicStream.h> +#include <Ice/InputStream.h> #include <Ice/ObserverHelper.h> #include <set> @@ -176,7 +176,7 @@ public: ThreadPoolCurrent(const InstancePtr&, const ThreadPoolPtr&, const ThreadPool::EventHandlerThreadPtr&); SocketOperation operation; - BasicStream stream; // A per-thread stream to be used by event handlers for optimization. + Ice::InputStream stream; // A per-thread stream to be used by event handlers for optimization. bool ioCompleted() const { diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp index 19f672b1459..312709fea1c 100644 --- a/cpp/src/Ice/TraceUtil.cpp +++ b/cpp/src/Ice/TraceUtil.cpp @@ -16,7 +16,8 @@ #include <Ice/Proxy.h> #include <Ice/TraceLevels.h> #include <Ice/Logger.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/Protocol.h> #include <Ice/ReplyStatus.h> #include <set> @@ -26,7 +27,7 @@ using namespace Ice; using namespace IceInternal; static void -printIdentityFacetOperation(ostream& s, BasicStream& stream) +printIdentityFacetOperation(ostream& s, InputStream& stream) { Identity identity; stream.read(identity); @@ -66,7 +67,7 @@ getMessageTypeAsString(Byte type) } static void -printRequestHeader(ostream& s, BasicStream& stream) +printRequestHeader(ostream& s, InputStream& stream) { printIdentityFacetOperation(s, stream); @@ -114,7 +115,7 @@ printRequestHeader(ostream& s, BasicStream& stream) } } - Ice::EncodingVersion v = stream.skipEncaps(); + Ice::EncodingVersion v = stream.skipEncapsulation(); if(v > Ice::Encoding_1_0) { s << "\nencoding = " << v; @@ -122,7 +123,7 @@ printRequestHeader(ostream& s, BasicStream& stream) } static Byte -printHeader(ostream& s, BasicStream& stream) +printHeader(ostream& s, InputStream& stream) { Byte magicNumber; stream.read(magicNumber); // Don't bother printing the magic number @@ -187,7 +188,7 @@ printHeader(ostream& s, BasicStream& stream) } static void -printRequest(ostream& s, BasicStream& stream) +printRequest(ostream& s, InputStream& stream) { Int requestId; stream.read(requestId); @@ -201,7 +202,7 @@ printRequest(ostream& s, BasicStream& stream) } static void -printBatchRequest(ostream& s, BasicStream& stream) +printBatchRequest(ostream& s, InputStream& stream) { int batchRequestNum; stream.read(batchRequestNum); @@ -215,7 +216,7 @@ printBatchRequest(ostream& s, BasicStream& stream) } static void -printReply(ostream& s, BasicStream& stream) +printReply(ostream& s, InputStream& stream) { Int requestId; stream.read(requestId); @@ -319,7 +320,7 @@ printReply(ostream& s, BasicStream& stream) if(replyStatus == replyOK || replyStatus == replyUserException) { - Ice::EncodingVersion v = stream.skipEncaps(); + Ice::EncodingVersion v = stream.skipEncapsulation(); if(v > Ice::Encoding_1_0) { s << "\nencoding = " << v; @@ -328,7 +329,7 @@ printReply(ostream& s, BasicStream& stream) } static Byte -printMessage(ostream& s, BasicStream& stream) +printMessage(ostream& s, InputStream& stream) { Byte type = printHeader(s, stream); @@ -408,29 +409,28 @@ IceInternal::traceSlicing(const char* kind, const string& typeId, const char* sl } void -IceInternal::traceSend(const BasicStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl) +IceInternal::traceSend(const OutputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl) { if(tl->protocol >= 1) { - BasicStream& stream = const_cast<BasicStream&>(str); - BasicStream::Container::iterator p = stream.i; - stream.i = stream.b.begin(); + OutputStream& stream = const_cast<OutputStream&>(str); + InputStream is(stream.instance(), stream.getEncoding(), stream); + is.i = is.b.begin(); ostringstream s; - Byte type = printMessage(s, stream); + Byte type = printMessage(s, is); logger->trace(tl->protocolCat, "sending " + getMessageTypeAsString(type) + " " + s.str()); - stream.i = p; } } void -IceInternal::traceRecv(const BasicStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl) +IceInternal::traceRecv(const InputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl) { if(tl->protocol >= 1) { - BasicStream& stream = const_cast<BasicStream&>(str); - BasicStream::Container::iterator p = stream.i; + InputStream& stream = const_cast<InputStream&>(str); + InputStream::Container::iterator p = stream.i; stream.i = stream.b.begin(); ostringstream s; @@ -442,12 +442,29 @@ IceInternal::traceRecv(const BasicStream& str, const LoggerPtr& logger, const Tr } void -IceInternal::trace(const char* heading, const BasicStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl) +IceInternal::trace(const char* heading, const OutputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl) +{ + if(tl->protocol >= 1) + { + OutputStream& stream = const_cast<OutputStream&>(str); + InputStream is(stream.instance(), stream.getEncoding(), stream); + is.i = is.b.begin(); + + ostringstream s; + s << heading; + printMessage(s, is); + + logger->trace(tl->protocolCat, s.str()); + } +} + +void +IceInternal::trace(const char* heading, const InputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl) { if(tl->protocol >= 1) { - BasicStream& stream = const_cast<BasicStream&>(str); - BasicStream::Container::iterator p = stream.i; + InputStream& stream = const_cast<InputStream&>(str); + InputStream::Container::iterator p = stream.i; stream.i = stream.b.begin(); ostringstream s; @@ -458,4 +475,3 @@ IceInternal::trace(const char* heading, const BasicStream& str, const LoggerPtr& stream.i = p; } } - diff --git a/cpp/src/Ice/TraceUtil.h b/cpp/src/Ice/TraceUtil.h index 04562dccf9f..8f9e84e4965 100644 --- a/cpp/src/Ice/TraceUtil.h +++ b/cpp/src/Ice/TraceUtil.h @@ -13,14 +13,21 @@ #include <Ice/LoggerF.h> #include <Ice/TraceLevelsF.h> -namespace IceInternal +namespace Ice { -class BasicStream; +class OutputStream; +class InputStream; + +} + +namespace IceInternal +{ -void traceSend(const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&); -void traceRecv(const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&); -void trace(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&); +void traceSend(const ::Ice::OutputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&); +void traceRecv(const ::Ice::InputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&); +void trace(const char*, const ::Ice::OutputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&); +void trace(const char*, const ::Ice::InputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&); void traceSlicing(const char*, const ::std::string&, const char *, const ::Ice::LoggerPtr&); } diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp index 4cf6d750b1e..6643bd35e2d 100644 --- a/cpp/src/Ice/UdpEndpointI.cpp +++ b/cpp/src/Ice/UdpEndpointI.cpp @@ -11,7 +11,8 @@ #include <Ice/Network.h> #include <Ice/UdpConnector.h> #include <Ice/UdpTransceiver.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> #include <Ice/Protocol.h> #include <Ice/ProtocolInstance.h> @@ -56,13 +57,13 @@ IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance) : { } -IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, BasicStream* s) : +IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, InputStream* s) : IPEndpointI(instance, s), _mcastTtl(-1), _connect(false), _compress(false) { - if(s->getReadEncoding() == Ice::Encoding_1_0) + if(s->getEncoding() == Ice::Encoding_1_0) { Ice::Byte b; s->read(b); @@ -286,10 +287,10 @@ IceInternal::UdpEndpointI::operator<(const LocalObject& r) const } void -IceInternal::UdpEndpointI::streamWriteImpl(BasicStream* s) const +IceInternal::UdpEndpointI::streamWriteImpl(OutputStream* s) const { IPEndpointI::streamWriteImpl(s); - if(s->getWriteEncoding() == Ice::Encoding_1_0) + if(s->getEncoding() == Ice::Encoding_1_0) { s->write(Ice::Protocol_1_0); s->write(Ice::Encoding_1_0); @@ -450,7 +451,7 @@ IceInternal::UdpEndpointFactory::create(vector<string>& args, bool oaEndpoint) c } EndpointIPtr -IceInternal::UdpEndpointFactory::read(BasicStream* s) const +IceInternal::UdpEndpointFactory::read(InputStream* s) const { return ICE_MAKE_SHARED(UdpEndpointI, _instance, s); } diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h index c29a9462b96..a3b0168c7bc 100644 --- a/cpp/src/Ice/UdpEndpointI.h +++ b/cpp/src/Ice/UdpEndpointI.h @@ -25,7 +25,7 @@ public: UdpEndpointI(const ProtocolInstancePtr&, const std::string&, Ice::Int, const Address&, const std::string&, Ice::Int, bool, const std::string&, bool); UdpEndpointI(const ProtocolInstancePtr&); - UdpEndpointI(const ProtocolInstancePtr&, BasicStream*); + UdpEndpointI(const ProtocolInstancePtr&, Ice::InputStream*); virtual Ice::EndpointInfoPtr getInfo() const; @@ -53,7 +53,7 @@ public: protected: - virtual void streamWriteImpl(BasicStream*) const; + virtual void streamWriteImpl(Ice::OutputStream*) const; virtual void hashInit(Ice::Int&) const; virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const; virtual bool checkOption(const std::string&, const std::string&, const std::string&); @@ -82,7 +82,7 @@ public: virtual Ice::Short type() const; virtual std::string protocol() const; virtual EndpointIPtr create(std::vector<std::string>&, bool) const; - virtual EndpointIPtr read(BasicStream*) const; + virtual EndpointIPtr read(Ice::InputStream*) const; virtual void destroy(); virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const; diff --git a/cpp/src/Ice/Value.cpp b/cpp/src/Ice/Value.cpp index 174a8a0857b..7e0b9e220da 100644 --- a/cpp/src/Ice/Value.cpp +++ b/cpp/src/Ice/Value.cpp @@ -8,8 +8,9 @@ // ********************************************************************** #include <Ice/Value.h> -#include <Ice/Stream.h> #include <Ice/LocalException.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #ifdef ICE_CPP11_MAPPING @@ -28,19 +29,19 @@ Ice::Value::ice_postUnmarshal() } void -Ice::Value::__write(IceInternal::BasicStream* os) const +Ice::Value::__write(Ice::OutputStream* os) const { - os->startWriteObject(0); + os->startObject(0); __writeImpl(os); - os->endWriteObject(); + os->endObject(); } void -Ice::Value::__read(IceInternal::BasicStream* is) +Ice::Value::__read(Ice::InputStream* is) { - is->startReadObject(); + is->startObject(); __readImpl(is); - is->endReadObject(false); + is->endObject(false); } namespace diff --git a/cpp/src/Ice/ValueFactoryManager.cpp b/cpp/src/Ice/ValueFactoryManager.cpp deleted file mode 100644 index a1f669cf4c1..00000000000 --- a/cpp/src/Ice/ValueFactoryManager.cpp +++ /dev/null @@ -1,179 +0,0 @@ - -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceUtil/DisableWarnings.h> -#include <Ice/ValueFactoryManager.h> -#include <Ice/ValueFactory.h> -#include <Ice/ObjectFactory.h> -#include <Ice/Object.h> -#include <Ice/Functional.h> -#include <Ice/LocalException.h> - -using namespace std; -using namespace Ice; -using namespace IceInternal; - -IceUtil::Shared* IceInternal::upCast(ValueFactoryManager* p) { return p; } - -void -IceInternal::ValueFactoryManager::add(const ICE_VALUE_FACTORY& factory, const string& id) -{ - IceUtil::Mutex::Lock sync(*this); - - if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id) - || _factoryMap.find(id) != _factoryMap.end()) - { - AlreadyRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = "value factory"; - ex.id = id; - throw ex; - } - - _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ICE_VALUE_FACTORY>(id, factory)); -} - -void -IceInternal::ValueFactoryManager::add(const Ice::ObjectFactoryPtr& factory, const string& id) -{ - IceUtil::Mutex::Lock sync(*this); - - // Check value factory map since an object factory is added to both object - // and value factory maps, but not vise versa - if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id) - || _factoryMap.find(id) != _factoryMap.end()) - { - AlreadyRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = "value factory"; - ex.id = id; - throw ex; - } - -#ifdef ICE_CPP11_MAPPING - _factoryMapHint = _factoryMap.insert(_factoryMapHint, - pair<const string, ICE_VALUE_FACTORY>(id, - [factory](const string& id) - { - return factory->create(id); - } - )); -#else - - class ValueFactoryWrapper: public Ice::ValueFactory - { - public: - ValueFactoryWrapper(const Ice::ObjectFactoryPtr& factory) : _objectFactory(factory) - { - } - - Ice::ValuePtr create(const std::string& id) - { - return _objectFactory->create(id); - } - - private: - Ice::ObjectFactoryPtr _objectFactory; - }; - - _factoryMapHint = _factoryMap.insert(_factoryMapHint, - pair<const string, ICE_VALUE_FACTORY>(id, new ValueFactoryWrapper(factory))); -#endif - - _objectFactoryMapHint = _objectFactoryMap.insert(_objectFactoryMapHint, - pair<const string, Ice::ObjectFactoryPtr>(id, factory)); -} - -ICE_VALUE_FACTORY -IceInternal::ValueFactoryManager::find(const string& id) const -{ - IceUtil::Mutex::Lock sync(*this); - - FactoryMap& factoryMap = const_cast<FactoryMap&>(_factoryMap); - - FactoryMap::iterator p = factoryMap.end(); - if(_factoryMapHint != factoryMap.end()) - { - if(_factoryMapHint->first == id) - { - p = _factoryMapHint; - } - } - - if(p == factoryMap.end()) - { - p = factoryMap.find(id); - } - - if(p != factoryMap.end()) - { - _factoryMapHint = p; - return p->second; - } - else - { - return ICE_NULLPTR; - } -} - -Ice::ObjectFactoryPtr -IceInternal::ValueFactoryManager::findObjectFactory(const string& id) const -{ - IceUtil::Mutex::Lock sync(*this); - - ObjectFactoryMap& objectfactoryMap = const_cast<ObjectFactoryMap&>(_objectFactoryMap); - - ObjectFactoryMap::iterator p = objectfactoryMap.end(); - if(_objectFactoryMapHint != objectfactoryMap.end()) - { - if(_objectFactoryMapHint->first == id) - { - p = _objectFactoryMapHint; - } - } - - if(p == objectfactoryMap.end()) - { - p = objectfactoryMap.find(id); - } - - if(p != objectfactoryMap.end()) - { - _objectFactoryMapHint = p; - return p->second; - } - else - { - return ICE_NULLPTR; - } -} - -IceInternal::ValueFactoryManager::ValueFactoryManager() : - _factoryMapHint(_factoryMap.end()), - _objectFactoryMapHint(_objectFactoryMap.end()) -{ -} - -void -IceInternal::ValueFactoryManager::destroy() -{ - ObjectFactoryMap oldMap; - { - IceUtil::Mutex::Lock sync(*this); - _factoryMap.clear(); - _factoryMapHint = _factoryMap.end(); - oldMap.swap(_objectFactoryMap); - _objectFactoryMapHint = _objectFactoryMap.end(); - } - - // - // Destroy all outside lock - // - for_each(oldMap.begin(), oldMap.end(), - Ice::secondVoidMemFun<const string, Ice::ObjectFactory>(&Ice::ObjectFactory::destroy)); -} diff --git a/cpp/src/Ice/ValueFactoryManager.h b/cpp/src/Ice/ValueFactoryManager.h deleted file mode 100644 index 433e9ca3a14..00000000000 --- a/cpp/src/Ice/ValueFactoryManager.h +++ /dev/null @@ -1,48 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef ICE_VALUE_FACTORY_MANAGER_H -#define ICE_VALUE_FACTORY_MANAGER_H - -#include <IceUtil/Shared.h> -#include <IceUtil/Mutex.h> -#include <Ice/ValueFactoryManagerF.h> -#include <Ice/ValueFactory.h> -#include <Ice/ObjectFactory.h> - -namespace IceInternal -{ - -class ValueFactoryManager : public ::IceUtil::Shared, public ::IceUtil::Mutex -{ -public: - - void add(const ICE_VALUE_FACTORY&, const std::string&); - void add(const Ice::ObjectFactoryPtr&, const std::string&); - ICE_VALUE_FACTORY find(const std::string&) const; - Ice::ObjectFactoryPtr findObjectFactory(const std::string&) const; - typedef std::map<std::string, ICE_VALUE_FACTORY> FactoryMap; - typedef std::map<std::string, Ice::ObjectFactoryPtr> ObjectFactoryMap; - -private: - - ValueFactoryManager(); - void destroy(); - friend class Instance; - - FactoryMap _factoryMap; - mutable FactoryMap::iterator _factoryMapHint; - - ObjectFactoryMap _objectFactoryMap; - mutable ObjectFactoryMap::iterator _objectFactoryMapHint; -}; - -} - -#endif diff --git a/cpp/src/Ice/ValueFactoryManagerI.cpp b/cpp/src/Ice/ValueFactoryManagerI.cpp new file mode 100644 index 00000000000..3f914041734 --- /dev/null +++ b/cpp/src/Ice/ValueFactoryManagerI.cpp @@ -0,0 +1,74 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#include <IceUtil/DisableWarnings.h> +#include <Ice/ValueFactoryManagerI.h> +#include <Ice/LocalException.h> + +using namespace std; +using namespace Ice; +using namespace IceInternal; + +void +#ifdef ICE_CPP11_MAPPING +IceInternal::ValueFactoryManagerI::add(function<Ice::ValuePtr (string)> factory, const string& id) +#else +IceInternal::ValueFactoryManagerI::add(const Ice::ValueFactoryPtr& factory, const string& id) +#endif +{ + IceUtil::Mutex::Lock sync(*this); + + if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id) + || _factoryMap.find(id) != _factoryMap.end()) + { + AlreadyRegisteredException ex(__FILE__, __LINE__); + ex.kindOfObject = "value factory"; + ex.id = id; + throw ex; + } + + _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ICE_VALUE_FACTORY>(id, factory)); +} + +ICE_VALUE_FACTORY +IceInternal::ValueFactoryManagerI::find(const string& id) const +{ + IceUtil::Mutex::Lock sync(*this); + + FactoryMap& factoryMap = const_cast<FactoryMap&>(_factoryMap); + + FactoryMap::iterator p = factoryMap.end(); + if(_factoryMapHint != factoryMap.end()) + { + if(_factoryMapHint->first == id) + { + p = _factoryMapHint; + } + } + + if(p == factoryMap.end()) + { + p = factoryMap.find(id); + } + + if(p != factoryMap.end()) + { + _factoryMapHint = p; + return p->second; + } + else + { + return ICE_NULLPTR; + } +} + +IceInternal::ValueFactoryManagerI::ValueFactoryManagerI() : + _factoryMapHint(_factoryMap.end()) +{ +} diff --git a/cpp/src/Ice/ValueFactoryManagerI.h b/cpp/src/Ice/ValueFactoryManagerI.h new file mode 100644 index 00000000000..bdddb42cb65 --- /dev/null +++ b/cpp/src/Ice/ValueFactoryManagerI.h @@ -0,0 +1,49 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_VALUE_FACTORY_MANAGER_I_H +#define ICE_VALUE_FACTORY_MANAGER_I_H + +#include <Ice/ValueFactory.h> +#include <Ice/VirtualShared.h> +#include <IceUtil/Mutex.h> + +namespace IceInternal +{ + +class ValueFactoryManagerI; +ICE_DEFINE_PTR(ValueFactoryManagerIPtr, ValueFactoryManagerI); + +class ValueFactoryManagerI : public Ice::EnableSharedFromThis<ValueFactoryManagerI>, + public Ice::ValueFactoryManager, + public IceUtil::Mutex +{ +public: + + ValueFactoryManagerI(); + +#ifdef ICE_CPP11_MAPPING + virtual void add(std::function<std::shared_ptr<Ice::Value> (std::string)>, const std::string&); + virtual std::function<std::shared_ptr<Ice::Value> (const std::string&)> find(const std::string&) const; +#else + virtual void add(const Ice::ValueFactoryPtr&, const std::string&); + virtual Ice::ValueFactoryPtr find(const std::string&) const; +#endif + +private: + + typedef std::map<std::string, ICE_VALUE_FACTORY> FactoryMap; + + FactoryMap _factoryMap; + mutable FactoryMap::iterator _factoryMapHint; +}; + +} + +#endif diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp index e54bb19c442..b4b8186a010 100644 --- a/cpp/src/Ice/WSEndpoint.cpp +++ b/cpp/src/Ice/WSEndpoint.cpp @@ -10,7 +10,8 @@ #include <Ice/WSEndpoint.h> #include <Ice/WSAcceptor.h> #include <Ice/WSConnector.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> #include <Ice/IPEndpointI.h> #include <Ice/HashUtil.h> @@ -44,7 +45,7 @@ IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& inst, const Endpo } } -IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, BasicStream* s) : +IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, InputStream* s) : _instance(instance), _delegate(ICE_DYNAMIC_CAST(IPEndpointI, del)) { @@ -76,12 +77,12 @@ IceInternal::WSEndpoint::protocol() const } void -IceInternal::WSEndpoint::streamWrite(BasicStream* s) const +IceInternal::WSEndpoint::streamWrite(OutputStream* s) const { - s->startWriteEncaps(); + s->startEncapsulation(); _delegate->streamWriteImpl(s); s->write(_resource, false); - s->endWriteEncaps(); + s->endEncapsulation(); } Int @@ -409,7 +410,7 @@ IceInternal::WSEndpointFactory::create(vector<string>& args, bool oaEndpoint) co } EndpointIPtr -IceInternal::WSEndpointFactory::read(BasicStream* s) const +IceInternal::WSEndpointFactory::read(InputStream* s) const { return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->read(s), s); } diff --git a/cpp/src/Ice/WSEndpoint.h b/cpp/src/Ice/WSEndpoint.h index c6bec0f1082..84becdf131c 100644 --- a/cpp/src/Ice/WSEndpoint.h +++ b/cpp/src/Ice/WSEndpoint.h @@ -37,12 +37,12 @@ public: WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, const std::string&); WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, std::vector<std::string>&); - WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, BasicStream*); + WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, Ice::InputStream*); virtual Ice::EndpointInfoPtr getInfo() const; virtual Ice::Short type() const; virtual const std::string& protocol() const; - virtual void streamWrite(BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; virtual Ice::Int timeout() const; virtual EndpointIPtr timeout(Ice::Int) const; @@ -97,7 +97,7 @@ public: virtual Ice::Short type() const; virtual std::string protocol() const; virtual EndpointIPtr create(std::vector<std::string>&, bool) const; - virtual EndpointIPtr read(BasicStream*) const; + virtual EndpointIPtr read(Ice::InputStream*) const; virtual void destroy(); virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const; diff --git a/cpp/src/Ice/winrt/StreamEndpointI.cpp b/cpp/src/Ice/winrt/StreamEndpointI.cpp index bdd3dc0295d..f63434d08b7 100644 --- a/cpp/src/Ice/winrt/StreamEndpointI.cpp +++ b/cpp/src/Ice/winrt/StreamEndpointI.cpp @@ -13,7 +13,8 @@ #include <Ice/winrt/StreamTransceiver.h> #include <Ice/Network.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> #include <Ice/ProtocolInstance.h> #include <Ice/DefaultsAndOverrides.h> @@ -61,7 +62,7 @@ IceInternal::StreamEndpointI::StreamEndpointI(const ProtocolInstancePtr& instanc { } -IceInternal::StreamEndpointI::StreamEndpointI(const ProtocolInstancePtr& instance, BasicStream* s) : +IceInternal::StreamEndpointI::StreamEndpointI(const ProtocolInstancePtr& instance, InputStream* s) : IPEndpointI(instance, s), _timeout(-1), _compress(false) @@ -291,7 +292,7 @@ IceInternal::StreamEndpointI::operator<(const LocalObject& r) const } void -IceInternal::StreamEndpointI::streamWriteImpl(BasicStream* s) const +IceInternal::StreamEndpointI::streamWriteImpl(OutputStream* s) const { IPEndpointI::streamWriteImpl(s); s->write(_timeout); @@ -422,7 +423,7 @@ IceInternal::StreamEndpointFactory::create(vector<string>& args, bool oaEndpoint } EndpointIPtr -IceInternal::StreamEndpointFactory::read(BasicStream* s) const +IceInternal::StreamEndpointFactory::read(InputStream* s) const { return new StreamEndpointI(_instance, s); } diff --git a/cpp/src/Ice/winrt/StreamEndpointI.h b/cpp/src/Ice/winrt/StreamEndpointI.h index a275081964e..70f2c16e5dd 100644 --- a/cpp/src/Ice/winrt/StreamEndpointI.h +++ b/cpp/src/Ice/winrt/StreamEndpointI.h @@ -26,7 +26,7 @@ public: StreamEndpointI(const ProtocolInstancePtr&, const std::string&, Ice::Int, Ice::Int, const std::string&, bool); StreamEndpointI(const ProtocolInstancePtr&); - StreamEndpointI(const ProtocolInstancePtr&, BasicStream*); + StreamEndpointI(const ProtocolInstancePtr&, Ice::InputStream*); virtual Ice::EndpointInfoPtr getInfo() const; virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const; @@ -52,7 +52,7 @@ public: protected: - virtual void streamWriteImpl(BasicStream*) const; + virtual void streamWriteImpl(Ice::OutputStream*) const; virtual void hashInit(Ice::Int&) const; virtual void initWithOptions(std::vector<std::string>&, bool); virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const; @@ -80,7 +80,7 @@ public: virtual Ice::Short type() const; virtual std::string protocol() const; virtual EndpointIPtr create(std::vector<std::string>&, bool) const; - virtual EndpointIPtr read(BasicStream*) const; + virtual EndpointIPtr read(Ice::InputStream*) const; virtual void destroy(); virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const; diff --git a/cpp/src/IceBT/EndpointI.cpp b/cpp/src/IceBT/EndpointI.cpp index eb79425fce3..5820316c6ea 100644 --- a/cpp/src/IceBT/EndpointI.cpp +++ b/cpp/src/IceBT/EndpointI.cpp @@ -14,7 +14,8 @@ #include <IceBT/Instance.h> #include <IceBT/Util.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/DefaultsAndOverrides.h> #include <Ice/HashUtil.h> #include <Ice/LocalException.h> @@ -72,7 +73,7 @@ IceBT::EndpointI::EndpointI(const InstancePtr& instance) : { } -IceBT::EndpointI::EndpointI(const InstancePtr& instance, IceInternal::BasicStream* s) : +IceBT::EndpointI::EndpointI(const InstancePtr& instance, InputStream* s) : _instance(instance), _channel(0), _timeout(-1), @@ -91,17 +92,17 @@ IceBT::EndpointI::EndpointI(const InstancePtr& instance, IceInternal::BasicStrea } void -IceBT::EndpointI::streamWrite(IceInternal::BasicStream* s) const +IceBT::EndpointI::streamWrite(OutputStream* s) const { // // _name and _channel are not marshaled. // - s->startWriteEncaps(); + s->startEncapsulation(); s->write(_addr, false); s->write(_uuid, false); s->write(_timeout); s->write(_compress); - s->endWriteEncaps(); + s->endEncapsulation(); } Ice::Short @@ -745,7 +746,7 @@ IceBT::EndpointFactoryI::create(vector<string>& args, bool oaEndpoint) const } IceInternal::EndpointIPtr -IceBT::EndpointFactoryI::read(IceInternal::BasicStream* s) const +IceBT::EndpointFactoryI::read(InputStream* s) const { return ICE_MAKE_SHARED(EndpointI, _instance, s); } diff --git a/cpp/src/IceBT/EndpointI.h b/cpp/src/IceBT/EndpointI.h index 6e83f29df3f..461f9c94bf9 100644 --- a/cpp/src/IceBT/EndpointI.h +++ b/cpp/src/IceBT/EndpointI.h @@ -28,9 +28,9 @@ public: EndpointI(const InstancePtr&, const std::string&, const std::string&, const std::string&, Ice::Int, Ice::Int, const std::string&, bool); EndpointI(const InstancePtr&); - EndpointI(const InstancePtr&, IceInternal::BasicStream*); + EndpointI(const InstancePtr&, Ice::InputStream*); - virtual void streamWrite(IceInternal::BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; virtual Ice::Short type() const; virtual const std::string& protocol() const; virtual Ice::Int timeout() const; @@ -137,7 +137,7 @@ public: virtual Ice::Short type() const; virtual std::string protocol() const; virtual IceInternal::EndpointIPtr create(std::vector<std::string>&, bool) const; - virtual IceInternal::EndpointIPtr read(IceInternal::BasicStream*) const; + virtual IceInternal::EndpointIPtr read(Ice::InputStream*) const; virtual void destroy(); virtual IceInternal::EndpointFactoryPtr clone(const IceInternal::ProtocolInstancePtr&) const; diff --git a/cpp/src/IceBox/.depend.mak b/cpp/src/IceBox/.depend.mak index acca092d800..7753740655c 100755 --- a/cpp/src/IceBox/.depend.mak +++ b/cpp/src/IceBox/.depend.mak @@ -37,7 +37,6 @@ Service.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -67,12 +66,12 @@ Service.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -81,7 +80,6 @@ Service.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -93,6 +91,7 @@ Service.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -121,7 +120,6 @@ Service.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -170,7 +168,6 @@ ServiceManagerI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -200,12 +197,12 @@ ServiceManagerI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -214,7 +211,6 @@ ServiceManagerI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -226,6 +222,7 @@ ServiceManagerI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -254,7 +251,6 @@ ServiceManagerI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -319,7 +315,6 @@ Admin.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -349,12 +344,12 @@ Admin.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -363,7 +358,6 @@ Admin.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -375,6 +369,7 @@ Admin.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -402,7 +397,6 @@ Admin.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -436,7 +430,6 @@ IceBox.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -473,12 +466,12 @@ IceBox.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -493,6 +486,7 @@ IceBox.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -523,7 +517,6 @@ Exception.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -560,12 +553,12 @@ Exception.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -580,6 +573,7 @@ Exception.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ diff --git a/cpp/src/IceDB/.depend.mak b/cpp/src/IceDB/.depend.mak index 82b960368a9..bdc812bf22e 100644..100755 --- a/cpp/src/IceDB/.depend.mak +++ b/cpp/src/IceDB/.depend.mak @@ -28,7 +28,6 @@ IceDB.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -58,12 +57,12 @@ IceDB.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -72,9 +71,8 @@ IceDB.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\Stream.h" \ + "$(includedir)\Ice\OutputStream.h" \ diff --git a/cpp/src/IceDB/IceDB.cpp b/cpp/src/IceDB/IceDB.cpp index ed0180e8d30..a679baa8819 100644 --- a/cpp/src/IceDB/IceDB.cpp +++ b/cpp/src/IceDB/IceDB.cpp @@ -9,7 +9,6 @@ #include <IceDB/IceDB.h> #include <Ice/Initialize.h> -#include <Ice/Stream.h> #include <lmdb.h> diff --git a/cpp/src/IceDB/IceDB.h b/cpp/src/IceDB/IceDB.h index f0f4ca793e1..56a36f9249d 100644 --- a/cpp/src/IceDB/IceDB.h +++ b/cpp/src/IceDB/IceDB.h @@ -13,7 +13,7 @@ #include <IceUtil/Exception.h> #include <IceUtil/FileUtil.h> #include <Ice/Initialize.h> -#include <Ice/Stream.h> +#include <Ice/OutputStream.h> #include <lmdb.h> @@ -494,41 +494,37 @@ struct IceContext }; template<typename T> -struct Codec<T, IceContext, Ice::OutputStreamPtr> +struct Codec<T, IceContext, Ice::OutputStream> { static void read(T& t, const MDB_val& val, const IceContext& ctx) { - std::pair<const Ice::Byte*, const Ice::Byte*> buf(static_cast<const Ice::Byte*>(val.mv_data), - static_cast<const Ice::Byte*>(val.mv_data) + val.mv_size); - Ice::InputStreamPtr in = Ice::wrapInputStream(ctx.communicator, buf, ctx.encoding); - in->read(t); + std::pair<const Ice::Byte*, const Ice::Byte*> p(static_cast<const Ice::Byte*>(val.mv_data), + static_cast<const Ice::Byte*>(val.mv_data) + val.mv_size); + Ice::InputStream in(ctx.communicator, ctx.encoding, p); + in.read(t); } - static void write(const T& t, MDB_val& val, Ice::OutputStreamPtr& holder, const IceContext& ctx) + static void write(const T& t, MDB_val& val, Ice::OutputStream& holder, const IceContext& ctx) { - holder = Ice::createOutputStream(ctx.communicator, ctx.encoding); - holder->write(t); - std::pair<const Ice::Byte*, const Ice::Byte*> buf = holder->finished(); - val.mv_size = buf.second - buf.first; - val.mv_data = const_cast<Ice::Byte*>(buf.first); + holder.initialize(ctx.communicator, ctx.encoding); + holder.write(t); + val.mv_size = holder.b.size(); + val.mv_data = &holder.b[0]; } static bool write(const T& t, MDB_val& val, const IceContext& ctx) { - // Cannot use stack-allocated bytes for now - Ice::OutputStreamPtr stream = Ice::createOutputStream(ctx.communicator, ctx.encoding); - stream->write(t); - std::pair<const Ice::Byte*, const Ice::Byte*> buf = stream->finished(); - size_t sz = static_cast<size_t>(buf.second - buf.first); - if(sz > val.mv_size) + Ice::OutputStream stream(ctx.communicator, ctx.encoding); + stream.write(t); + if(stream.b.size() > val.mv_size) { - val.mv_size = sz; + val.mv_size = stream.b.size(); return false; } else { - val.mv_size = sz; - memcpy(val.mv_data, buf.first, sz); + val.mv_size = stream.b.size(); + memcpy(val.mv_data, &stream.b[0], stream.b.size()); return true; } } @@ -542,6 +538,7 @@ struct Codec<T, IceContext, Ice::OutputStreamPtr> // ICE_DB_API size_t getMapSize(int); + } #endif diff --git a/cpp/src/IceDiscovery/.depend.mak b/cpp/src/IceDiscovery/.depend.mak index 1209fd39445..1c5b5f8f713 100755 --- a/cpp/src/IceDiscovery/.depend.mak +++ b/cpp/src/IceDiscovery/.depend.mak @@ -21,7 +21,6 @@ LocatorI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -58,12 +57,12 @@ LocatorI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -78,6 +77,7 @@ LocatorI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -90,7 +90,6 @@ LocatorI.obj: \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -118,7 +117,6 @@ LookupI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -155,12 +153,12 @@ LookupI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -180,11 +178,11 @@ LookupI.obj: \ "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -244,7 +242,6 @@ PluginI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -271,11 +268,11 @@ PluginI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -284,7 +281,6 @@ PluginI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -295,6 +291,7 @@ PluginI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -322,7 +319,6 @@ PluginI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -356,7 +352,6 @@ IceDiscovery.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -393,12 +388,12 @@ IceDiscovery.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -413,6 +408,7 @@ IceDiscovery.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ diff --git a/cpp/src/IceGrid/.depend.mak b/cpp/src/IceGrid/.depend.mak index ed3aeeed257..1352f5126a0 100755 --- a/cpp/src/IceGrid/.depend.mak +++ b/cpp/src/IceGrid/.depend.mak @@ -72,7 +72,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -102,12 +101,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -116,7 +115,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -127,6 +125,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -155,7 +154,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -200,7 +198,6 @@ DescriptorBuilder.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -237,12 +234,12 @@ DescriptorBuilder.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -257,11 +254,11 @@ DescriptorBuilder.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -317,7 +314,6 @@ DescriptorHelper.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -347,12 +343,12 @@ DescriptorHelper.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -361,7 +357,6 @@ DescriptorHelper.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -373,6 +368,7 @@ DescriptorHelper.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -401,7 +397,6 @@ DescriptorHelper.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -460,7 +455,6 @@ DescriptorParser.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -490,12 +484,12 @@ DescriptorParser.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -504,7 +498,6 @@ DescriptorParser.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -516,6 +509,7 @@ DescriptorParser.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -544,7 +538,6 @@ DescriptorParser.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -591,7 +584,6 @@ FileParserI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -628,12 +620,12 @@ FileParserI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -648,6 +640,7 @@ FileParserI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -710,7 +703,6 @@ Parser.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -737,11 +729,11 @@ Parser.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -750,7 +742,6 @@ Parser.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -761,6 +752,7 @@ Parser.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -788,7 +780,6 @@ Parser.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -851,7 +842,6 @@ Util.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -881,12 +871,12 @@ Util.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -895,7 +885,6 @@ Util.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -907,6 +896,7 @@ Util.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -935,7 +925,6 @@ Util.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -979,7 +968,6 @@ Internal.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1016,12 +1004,12 @@ Internal.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1036,6 +1024,7 @@ Internal.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1080,7 +1069,6 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1117,12 +1105,12 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1137,6 +1125,7 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1180,7 +1169,6 @@ Grammar.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1210,12 +1198,12 @@ Grammar.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1224,7 +1212,6 @@ Grammar.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1236,6 +1223,7 @@ Grammar.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1264,7 +1252,6 @@ Grammar.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1317,7 +1304,6 @@ Scanner.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1347,12 +1333,12 @@ Scanner.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1361,7 +1347,6 @@ Scanner.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1373,6 +1358,7 @@ Scanner.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1401,7 +1387,6 @@ Scanner.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1457,7 +1442,6 @@ IceGridDB.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1487,12 +1471,12 @@ IceGridDB.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1501,7 +1485,6 @@ IceGridDB.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1513,6 +1496,7 @@ IceGridDB.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1540,7 +1524,6 @@ IceGridDB.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1584,7 +1567,6 @@ DBTypes.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1621,12 +1603,12 @@ DBTypes.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1641,6 +1623,7 @@ DBTypes.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1693,7 +1676,6 @@ AdminRouter.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1723,12 +1705,12 @@ AdminRouter.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1737,7 +1719,6 @@ AdminRouter.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1749,6 +1730,7 @@ AdminRouter.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1777,7 +1759,6 @@ AdminRouter.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1807,7 +1788,6 @@ FileCache.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1844,12 +1824,12 @@ FileCache.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1864,11 +1844,11 @@ FileCache.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -1902,7 +1882,6 @@ PlatformInfo.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1939,12 +1918,12 @@ PlatformInfo.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1959,11 +1938,11 @@ PlatformInfo.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -2023,7 +2002,6 @@ SessionManager.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2053,12 +2031,12 @@ SessionManager.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2067,7 +2045,6 @@ SessionManager.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -2079,6 +2056,7 @@ SessionManager.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -2107,7 +2085,6 @@ SessionManager.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -2149,7 +2126,6 @@ TraceLevels.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2186,12 +2162,12 @@ TraceLevels.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2206,11 +2182,11 @@ TraceLevels.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -2253,7 +2229,6 @@ Activator.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2283,12 +2258,12 @@ Activator.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2297,7 +2272,6 @@ Activator.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -2309,6 +2283,7 @@ Activator.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -2337,7 +2312,6 @@ Activator.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -2398,7 +2372,6 @@ NodeAdminRouter.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2428,12 +2401,12 @@ NodeAdminRouter.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2448,6 +2421,7 @@ NodeAdminRouter.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -2478,7 +2452,6 @@ NodeAdminRouter.obj: \ "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -2505,7 +2478,6 @@ NodeAdminRouter.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ @@ -2549,7 +2521,6 @@ NodeI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2579,12 +2550,12 @@ NodeI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2593,7 +2564,6 @@ NodeI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -2605,6 +2575,7 @@ NodeI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -2633,7 +2604,6 @@ NodeI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -2704,7 +2674,6 @@ NodeSessionManager.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2734,12 +2703,12 @@ NodeSessionManager.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2748,7 +2717,6 @@ NodeSessionManager.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -2760,6 +2728,7 @@ NodeSessionManager.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -2788,7 +2757,6 @@ NodeSessionManager.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -2851,7 +2819,6 @@ ServerAdapterI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2881,12 +2848,12 @@ ServerAdapterI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2895,7 +2862,6 @@ ServerAdapterI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -2907,6 +2873,7 @@ ServerAdapterI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -2935,7 +2902,6 @@ ServerAdapterI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -3001,7 +2967,6 @@ ServerI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3031,12 +2996,12 @@ ServerI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3045,7 +3010,6 @@ ServerI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -3057,6 +3021,7 @@ ServerI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -3085,7 +3050,6 @@ ServerI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -3145,7 +3109,6 @@ AdapterCache.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3182,12 +3145,12 @@ AdapterCache.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3202,11 +3165,11 @@ AdapterCache.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -3268,7 +3231,6 @@ AdapterCache.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ @@ -3312,7 +3274,6 @@ AdminCallbackRouter.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3342,12 +3303,12 @@ AdminCallbackRouter.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3356,7 +3317,6 @@ AdminCallbackRouter.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -3368,6 +3328,7 @@ AdminCallbackRouter.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -3396,7 +3357,6 @@ AdminCallbackRouter.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -3443,7 +3403,6 @@ AdminI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3473,12 +3432,12 @@ AdminI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3487,7 +3446,6 @@ AdminI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -3499,6 +3457,7 @@ AdminI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -3527,7 +3486,6 @@ AdminI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -3625,7 +3583,6 @@ AdminSessionI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3655,12 +3612,12 @@ AdminSessionI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3669,7 +3626,6 @@ AdminSessionI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -3681,6 +3637,7 @@ AdminSessionI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -3709,7 +3666,6 @@ AdminSessionI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -3802,7 +3758,6 @@ Allocatable.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3832,12 +3787,12 @@ Allocatable.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3852,6 +3807,7 @@ Allocatable.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -3866,7 +3822,6 @@ Allocatable.obj: \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ "SessionServantManager.h" \ @@ -3899,7 +3854,6 @@ Allocatable.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -3934,7 +3888,6 @@ AllocatableObjectCache.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3971,12 +3924,12 @@ AllocatableObjectCache.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3991,11 +3944,11 @@ AllocatableObjectCache.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -4049,7 +4002,6 @@ AllocatableObjectCache.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -4086,7 +4038,6 @@ Database.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4127,12 +4078,11 @@ Database.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4146,6 +4096,7 @@ Database.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -4202,7 +4153,6 @@ Database.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\Stream.h" \ "DescriptorHelper.h" \ "$(includedir)\IceUtil\OutputUtil.h" \ "$(includedir)\IceXML\Parser.h" \ @@ -4232,7 +4182,6 @@ FileUserAccountMapperI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4269,12 +4218,12 @@ FileUserAccountMapperI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4289,6 +4238,7 @@ FileUserAccountMapperI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -4324,7 +4274,6 @@ InternalRegistryI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4354,12 +4303,12 @@ InternalRegistryI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4368,7 +4317,6 @@ InternalRegistryI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -4380,6 +4328,7 @@ InternalRegistryI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -4408,7 +4357,6 @@ InternalRegistryI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -4503,7 +4451,6 @@ LocatorI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4533,12 +4480,12 @@ LocatorI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4547,7 +4494,6 @@ LocatorI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -4559,6 +4505,7 @@ LocatorI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -4587,7 +4534,6 @@ LocatorI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -4671,7 +4617,6 @@ LocatorRegistryI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4701,12 +4646,12 @@ LocatorRegistryI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4715,7 +4660,6 @@ LocatorRegistryI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -4727,6 +4671,7 @@ LocatorRegistryI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -4755,7 +4700,6 @@ LocatorRegistryI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -4822,7 +4766,6 @@ NodeCache.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4859,12 +4802,12 @@ NodeCache.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4879,11 +4822,11 @@ NodeCache.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -4941,7 +4884,6 @@ NodeCache.obj: \ "$(includedir)\Ice\Application.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ @@ -4995,7 +4937,6 @@ NodeSessionI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5025,12 +4966,12 @@ NodeSessionI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5039,7 +4980,6 @@ NodeSessionI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -5051,6 +4991,7 @@ NodeSessionI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -5079,7 +5020,6 @@ NodeSessionI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -5144,7 +5084,6 @@ ObjectCache.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5181,12 +5120,12 @@ ObjectCache.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5201,11 +5140,11 @@ ObjectCache.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -5265,7 +5204,6 @@ ObjectCache.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ @@ -5303,7 +5241,6 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5335,12 +5272,12 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5355,6 +5292,7 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -5388,7 +5326,6 @@ PluginFacadeI.obj: \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\IceUtil\Random.h" \ "TraceLevels.h" \ - "$(includedir)\Ice\LoggerF.h" \ "NodeCache.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "ReplicaCache.h" \ @@ -5407,7 +5344,6 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\Stream.h" \ QueryI.obj: \ QueryI.cpp \ @@ -5426,7 +5362,6 @@ QueryI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5463,12 +5398,12 @@ QueryI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5483,6 +5418,7 @@ QueryI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -5514,7 +5450,6 @@ QueryI.obj: \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\IceUtil\Random.h" \ "TraceLevels.h" \ - "$(includedir)\Ice\LoggerF.h" \ "NodeCache.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "ReplicaCache.h" \ @@ -5535,7 +5470,6 @@ QueryI.obj: \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\Stream.h" \ ReapThread.obj: \ ReapThread.cpp \ @@ -5566,7 +5500,6 @@ ReapThread.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5596,12 +5529,12 @@ ReapThread.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5610,7 +5543,6 @@ ReapThread.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -5622,6 +5554,7 @@ ReapThread.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -5650,7 +5583,6 @@ ReapThread.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -5689,7 +5621,6 @@ RegistryAdminRouter.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5721,12 +5652,12 @@ RegistryAdminRouter.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5741,6 +5672,7 @@ RegistryAdminRouter.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -5769,7 +5701,6 @@ RegistryAdminRouter.obj: \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\IceUtil\Random.h" \ "TraceLevels.h" \ - "$(includedir)\Ice\LoggerF.h" \ "NodeCache.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "ReplicaCache.h" \ @@ -5790,7 +5721,6 @@ RegistryAdminRouter.obj: \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\Stream.h" \ "AdminRouter.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Comparable.h" \ @@ -5856,7 +5786,6 @@ RegistryI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5886,12 +5815,12 @@ RegistryI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5900,7 +5829,6 @@ RegistryI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -5912,6 +5840,7 @@ RegistryI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -5940,7 +5869,6 @@ RegistryI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -6044,7 +5972,6 @@ ReplicaCache.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6081,12 +6008,12 @@ ReplicaCache.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6101,11 +6028,11 @@ ReplicaCache.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -6174,7 +6101,6 @@ ReplicaSessionI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6204,12 +6130,12 @@ ReplicaSessionI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6218,7 +6144,6 @@ ReplicaSessionI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -6230,6 +6155,7 @@ ReplicaSessionI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -6258,7 +6184,6 @@ ReplicaSessionI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -6336,7 +6261,6 @@ ReplicaSessionManager.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6366,12 +6290,12 @@ ReplicaSessionManager.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6380,7 +6304,6 @@ ReplicaSessionManager.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -6392,6 +6315,7 @@ ReplicaSessionManager.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -6420,7 +6344,6 @@ ReplicaSessionManager.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -6488,7 +6411,6 @@ ServerCache.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6529,12 +6451,11 @@ ServerCache.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6548,6 +6469,7 @@ ServerCache.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -6612,7 +6534,6 @@ ServerCache.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ @@ -6658,7 +6579,6 @@ SessionI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6688,12 +6608,12 @@ SessionI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6702,7 +6622,6 @@ SessionI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -6714,6 +6633,7 @@ SessionI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -6742,7 +6662,6 @@ SessionI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -6818,7 +6737,6 @@ SessionServantManager.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6857,12 +6775,12 @@ SessionServantManager.obj: \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6881,7 +6799,6 @@ SessionServantManager.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -6892,6 +6809,7 @@ SessionServantManager.obj: \ "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -6916,7 +6834,6 @@ SessionServantManager.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -6964,7 +6881,6 @@ Topics.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6994,12 +6910,12 @@ Topics.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -7008,7 +6924,6 @@ Topics.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -7020,6 +6935,7 @@ Topics.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -7048,7 +6964,6 @@ Topics.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -7096,7 +7011,6 @@ WellKnownObjectsManager.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7135,12 +7049,12 @@ WellKnownObjectsManager.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -7154,6 +7068,7 @@ WellKnownObjectsManager.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -7186,7 +7101,6 @@ WellKnownObjectsManager.obj: \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\IceUtil\Random.h" \ "TraceLevels.h" \ - "$(includedir)\Ice\LoggerF.h" \ "NodeCache.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "ReplicaCache.h" \ @@ -7207,7 +7121,6 @@ WellKnownObjectsManager.obj: \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\Stream.h" \ IceGridNode.obj: \ IceGridNode.cpp \ @@ -7241,7 +7154,6 @@ IceGridNode.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7271,12 +7183,12 @@ IceGridNode.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -7285,7 +7197,6 @@ IceGridNode.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -7297,6 +7208,7 @@ IceGridNode.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -7325,7 +7237,6 @@ IceGridNode.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -7408,7 +7319,6 @@ IceGridRegistry.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7438,12 +7348,12 @@ IceGridRegistry.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -7452,7 +7362,6 @@ IceGridRegistry.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -7464,6 +7373,7 @@ IceGridRegistry.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -7492,7 +7402,6 @@ IceGridRegistry.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index 75624feb9e4..40f9379a7e9 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -30,11 +30,11 @@ using namespace std; using namespace IceGrid; -typedef IceDB::ReadWriteCursor<string, ApplicationInfo, IceDB::IceContext, Ice::OutputStreamPtr> ApplicationMapRWCursor; -typedef IceDB::ReadOnlyCursor<string, AdapterInfo, IceDB::IceContext, Ice::OutputStreamPtr> AdapterMapROCursor; -typedef IceDB::Cursor<string, string, IceDB::IceContext, Ice::OutputStreamPtr> AdaptersByGroupMapCursor; -typedef IceDB::ReadOnlyCursor<string, Ice::Identity, IceDB::IceContext, Ice::OutputStreamPtr> ObjectsByTypeMapROCursor; -typedef IceDB::ReadOnlyCursor<Ice::Identity, ObjectInfo, IceDB::IceContext, Ice::OutputStreamPtr> ObjectsMapROCursor; +typedef IceDB::ReadWriteCursor<string, ApplicationInfo, IceDB::IceContext, Ice::OutputStream> ApplicationMapRWCursor; +typedef IceDB::ReadOnlyCursor<string, AdapterInfo, IceDB::IceContext, Ice::OutputStream> AdapterMapROCursor; +typedef IceDB::Cursor<string, string, IceDB::IceContext, Ice::OutputStream> AdaptersByGroupMapCursor; +typedef IceDB::ReadOnlyCursor<string, Ice::Identity, IceDB::IceContext, Ice::OutputStream> ObjectsByTypeMapROCursor; +typedef IceDB::ReadOnlyCursor<Ice::Identity, ObjectInfo, IceDB::IceContext, Ice::OutputStream> ObjectsMapROCursor; namespace { diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h index fd1cf7d8b5c..5d5855889a0 100644 --- a/cpp/src/IceGrid/Database.h +++ b/cpp/src/IceGrid/Database.h @@ -46,16 +46,16 @@ typedef IceUtil::Handle<ServerEntry> ServerEntryPtr; class ApplicationHelper; -typedef IceDB::Dbi<std::string, IceGrid::ApplicationInfo, IceDB::IceContext, Ice::OutputStreamPtr> +typedef IceDB::Dbi<std::string, IceGrid::ApplicationInfo, IceDB::IceContext, Ice::OutputStream> StringApplicationInfoMap; -typedef IceDB::Dbi<Ice::Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStreamPtr> IdentityObjectInfoMap; -typedef IceDB::Dbi<std::string, Ice::Identity, IceDB::IceContext, Ice::OutputStreamPtr> StringIdentityMap; +typedef IceDB::Dbi<Ice::Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream> IdentityObjectInfoMap; +typedef IceDB::Dbi<std::string, Ice::Identity, IceDB::IceContext, Ice::OutputStream> StringIdentityMap; -typedef IceDB::Dbi<std::string, IceGrid::AdapterInfo, IceDB::IceContext, Ice::OutputStreamPtr> StringAdapterInfoMap; -typedef IceDB::Dbi<std::string, std::string, IceDB::IceContext, Ice::OutputStreamPtr> StringStringMap; +typedef IceDB::Dbi<std::string, IceGrid::AdapterInfo, IceDB::IceContext, Ice::OutputStream> StringAdapterInfoMap; +typedef IceDB::Dbi<std::string, std::string, IceDB::IceContext, Ice::OutputStream> StringStringMap; -typedef IceDB::Dbi<std::string, Ice::Long, IceDB::IceContext, Ice::OutputStreamPtr> StringLongMap; +typedef IceDB::Dbi<std::string, Ice::Long, IceDB::IceContext, Ice::OutputStream> StringLongMap; class Database : public IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex> { diff --git a/cpp/src/IceGrid/IceGridDB.cpp b/cpp/src/IceGrid/IceGridDB.cpp index 2c810287d3f..dcdfa883d98 100644 --- a/cpp/src/IceGrid/IceGridDB.cpp +++ b/cpp/src/IceGrid/IceGridDB.cpp @@ -268,6 +268,14 @@ Client::run(int argc, char* argv[]) fs.seekg(0, ios::end); streampos fileSize = fs.tellg(); + + if(!fileSize) + { + fs.close(); + cerr << "Empty input file" << endl; + return EXIT_FAILURE; + } + fs.seekg(0, ios::beg); vector<Ice::Byte> buf; @@ -279,22 +287,22 @@ Client::run(int argc, char* argv[]) if(!serverVersion.empty()) { ValueFactoryPtr factory = new ValueFactoryI(serverVersion); - communicator()->addValueFactory(factory, "::IceGrid::ServerDescriptor"); - communicator()->addValueFactory(factory, "::IceGrid::IceBoxDescriptor"); + communicator()->getValueFactoryManager()->add(factory, "::IceGrid::ServerDescriptor"); + communicator()->getValueFactoryManager()->add(factory, "::IceGrid::IceBoxDescriptor"); } - Ice::InputStreamPtr stream = Ice::wrapInputStream(communicator(), buf, dbContext.encoding); + Ice::InputStream stream(communicator(), dbContext.encoding, buf); string type; int version; - stream->read(type); + stream.read(type); if(type != "IceGrid") { cerr << "Incorrect input file type: " << type << endl; return EXIT_FAILURE; } - stream->read(version); + stream.read(version); if(version / 100 == 305) { if(debug) @@ -303,7 +311,7 @@ Client::run(int argc, char* argv[]) } skipFilter = true; } - stream->read(data); + stream.read(data); { IceDB::Env env(dbPath, 5, mapSize); @@ -314,7 +322,7 @@ Client::run(int argc, char* argv[]) cout << "Writing Applications Map:" << endl; } - IceDB::Dbi<string, ApplicationInfo, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::Dbi<string, ApplicationInfo, IceDB::IceContext, Ice::OutputStream> apps(txn, "applications", dbContext, MDB_CREATE); for(ApplicationInfoSeq::const_iterator p = data.applications.begin(); p != data.applications.end(); ++p) @@ -331,7 +339,7 @@ Client::run(int argc, char* argv[]) cout << "Writing Adapters Map:" << endl; } - IceDB::Dbi<string, AdapterInfo, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::Dbi<string, AdapterInfo, IceDB::IceContext, Ice::OutputStream> adpts(txn, "adapters", dbContext, MDB_CREATE); for(AdapterInfoSeq::const_iterator p = data.adapters.begin(); p != data.adapters.end(); ++p) @@ -348,7 +356,7 @@ Client::run(int argc, char* argv[]) cout << "Writing Objects Map:" << endl; } - IceDB::Dbi<Identity, ObjectInfo, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::Dbi<Identity, ObjectInfo, IceDB::IceContext, Ice::OutputStream> objs(txn, "objects", dbContext, MDB_CREATE); for(ObjectInfoSeq::const_iterator p = data.objects.begin(); p != data.objects.end(); ++p) @@ -365,7 +373,7 @@ Client::run(int argc, char* argv[]) cout << "Writing Internal Objects Map:" << endl; } - IceDB::Dbi<Identity, ObjectInfo, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::Dbi<Identity, ObjectInfo, IceDB::IceContext, Ice::OutputStream> internalObjs(txn, "internal-objects", dbContext, MDB_CREATE); for(ObjectInfoSeq::const_iterator p = data.internalObjects.begin(); p != data.internalObjects.end(); ++p) @@ -382,7 +390,7 @@ Client::run(int argc, char* argv[]) cout << "Writing Serials Map:" << endl; } - IceDB::Dbi<string, Long, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::Dbi<string, Long, IceDB::IceContext, Ice::OutputStream> srls(txn, "serials", dbContext, MDB_CREATE); for(StringLongDict::const_iterator p = data.serials.begin(); p != data.serials.end(); ++p) @@ -411,12 +419,12 @@ Client::run(int argc, char* argv[]) cout << "Reading Application Map:" << endl; } - IceDB::Dbi<string, IceGrid::ApplicationInfo, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::Dbi<string, IceGrid::ApplicationInfo, IceDB::IceContext, Ice::OutputStream> applications(txn, "applications", dbContext, 0); string name; ApplicationInfo application; - IceDB::ReadOnlyCursor<string, IceGrid::ApplicationInfo, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::ReadOnlyCursor<string, IceGrid::ApplicationInfo, IceDB::IceContext, Ice::OutputStream> appCursor(applications, txn); while(appCursor.get(name, application, MDB_NEXT)) { @@ -433,11 +441,11 @@ Client::run(int argc, char* argv[]) cout << "Reading Adapter Map:" << endl; } - IceDB::Dbi<string, IceGrid::AdapterInfo, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::Dbi<string, IceGrid::AdapterInfo, IceDB::IceContext, Ice::OutputStream> adapters(txn, "adapters", dbContext, 0); AdapterInfo adapter; - IceDB::ReadOnlyCursor<string, IceGrid::AdapterInfo, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::ReadOnlyCursor<string, IceGrid::AdapterInfo, IceDB::IceContext, Ice::OutputStream> adapterCursor(adapters, txn); while(adapterCursor.get(name, adapter, MDB_NEXT)) { @@ -454,12 +462,12 @@ Client::run(int argc, char* argv[]) cout << "Reading Object Map:" << endl; } - IceDB::Dbi<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::Dbi<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream> objects(txn, "objects", dbContext, 0); Identity id; ObjectInfo object; - IceDB::ReadOnlyCursor<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::ReadOnlyCursor<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream> objCursor(objects, txn); while(objCursor.get(id, object, MDB_NEXT)) { @@ -476,10 +484,10 @@ Client::run(int argc, char* argv[]) cout << "Reading Internal Object Map:" << endl; } - IceDB::Dbi<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::Dbi<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream> internalObjects(txn, "internal-objects", dbContext, 0); - IceDB::ReadOnlyCursor<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::ReadOnlyCursor<Identity, IceGrid::ObjectInfo, IceDB::IceContext, Ice::OutputStream> iobjCursor(internalObjects, txn); while(iobjCursor.get(id, object, MDB_NEXT)) { @@ -496,11 +504,11 @@ Client::run(int argc, char* argv[]) cout << "Reading Serials Map:" << endl; } - IceDB::Dbi<string, Long, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::Dbi<string, Long, IceDB::IceContext, Ice::OutputStream> serials(txn, "serials", dbContext, 0); Long serial; - IceDB::ReadOnlyCursor<string, Long, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::ReadOnlyCursor<string, Long, IceDB::IceContext, Ice::OutputStream> serialCursor(serials, txn); while(serialCursor.get(name, serial, MDB_NEXT)) { @@ -516,11 +524,10 @@ Client::run(int argc, char* argv[]) env.close(); } - Ice::OutputStreamPtr stream = Ice::createOutputStream(communicator(), dbContext.encoding); - stream->write("IceGrid"); - stream->write(ICE_INT_VERSION); - stream->write(data); - pair<const Ice::Byte*, const Ice::Byte*> buf = stream->finished(); + Ice::OutputStream stream(communicator(), dbContext.encoding); + stream.write("IceGrid"); + stream.write(ICE_INT_VERSION); + stream.write(data); ofstream fs(dbFile.c_str(), ios::binary); if(fs.fail()) @@ -528,7 +535,7 @@ Client::run(int argc, char* argv[]) cerr << "Could not open output file: " << strerror(errno) << endl; return EXIT_FAILURE; } - fs.write(reinterpret_cast<const char*>(buf.first), buf.second - buf.first); + fs.write(reinterpret_cast<const char*>(stream.b.begin()), stream.b.size()); fs.close(); } } diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index 4d41837681a..cdf4d82d6a1 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -22,7 +22,7 @@ REGISTRY_SERVER_R = $(top_srcdir)\bin\icegridregistry.exe REGISTRY_SERVER = $(top_srcdir)\bin\icegridregistry$(LIBSUFFIX).exe -TARGETS = $(ADMIN) $(NODE_SERVER) $(REGISTRY_SERVER) $(DB) +TARGETS = $(ADMIN) $(NODE_SERVER) $(REGISTRY_SERVER) #$(DB) CSLICE_OBJS = .\Internal.obj \ .\IceLocatorDiscovery.obj diff --git a/cpp/src/IceGridLib/.depend.mak b/cpp/src/IceGridLib/.depend.mak index 5fa76709173..5b0fe9c76ca 100755 --- a/cpp/src/IceGridLib/.depend.mak +++ b/cpp/src/IceGridLib/.depend.mak @@ -96,7 +96,6 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -133,12 +132,12 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -153,6 +152,7 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -191,7 +191,6 @@ Admin.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -228,12 +227,12 @@ Admin.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -248,6 +247,7 @@ Admin.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -286,7 +286,6 @@ Descriptor.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -323,12 +322,12 @@ Descriptor.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -343,6 +342,7 @@ Descriptor.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -372,7 +372,6 @@ Exception.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -395,8 +394,9 @@ Exception.obj: \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceGrid\Config.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ @@ -404,10 +404,11 @@ Exception.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ @@ -429,7 +430,6 @@ FileParser.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -466,12 +466,12 @@ FileParser.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -486,6 +486,7 @@ FileParser.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -525,7 +526,6 @@ PluginFacade.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -562,12 +562,12 @@ PluginFacade.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -582,6 +582,7 @@ PluginFacade.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -621,7 +622,6 @@ Registry.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -658,12 +658,12 @@ Registry.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -678,6 +678,7 @@ Registry.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -720,7 +721,6 @@ Session.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -757,12 +757,12 @@ Session.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -777,6 +777,7 @@ Session.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -812,7 +813,6 @@ UserAccountMapper.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -849,12 +849,12 @@ UserAccountMapper.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -869,6 +869,7 @@ UserAccountMapper.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ diff --git a/cpp/src/IceLocatorDiscovery/.depend.mak b/cpp/src/IceLocatorDiscovery/.depend.mak index 7cf54fe5332..1524b3631a9 100755 --- a/cpp/src/IceLocatorDiscovery/.depend.mak +++ b/cpp/src/IceLocatorDiscovery/.depend.mak @@ -44,7 +44,6 @@ PluginI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -71,11 +70,11 @@ PluginI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -84,7 +83,6 @@ PluginI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -95,6 +93,7 @@ PluginI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -122,7 +121,6 @@ PluginI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -154,7 +152,6 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -191,12 +188,12 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -211,6 +208,7 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ diff --git a/cpp/src/IcePatch2/.depend.mak b/cpp/src/IcePatch2/.depend.mak index 194831d071b..2bf4b8a93ee 100755 --- a/cpp/src/IcePatch2/.depend.mak +++ b/cpp/src/IcePatch2/.depend.mak @@ -34,7 +34,6 @@ FileServerI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -63,12 +62,12 @@ FileServerI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -77,7 +76,6 @@ FileServerI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -89,6 +87,7 @@ FileServerI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -117,7 +116,6 @@ FileServerI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -168,7 +166,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -198,12 +195,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -212,7 +209,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -224,6 +220,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -252,7 +249,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -302,7 +298,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -332,12 +327,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -346,7 +341,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -358,6 +352,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -385,7 +380,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -437,7 +431,6 @@ Calc.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -467,12 +460,12 @@ Calc.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -481,7 +474,6 @@ Calc.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -493,6 +485,7 @@ Calc.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -521,7 +514,6 @@ Calc.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/src/IcePatch2Lib/.depend.mak b/cpp/src/IcePatch2Lib/.depend.mak index c68febc1e87..d80decac2df 100755 --- a/cpp/src/IcePatch2Lib/.depend.mak +++ b/cpp/src/IcePatch2Lib/.depend.mak @@ -40,7 +40,6 @@ ClientUtil.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -70,12 +69,12 @@ ClientUtil.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -84,7 +83,6 @@ ClientUtil.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -96,6 +94,7 @@ ClientUtil.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -124,7 +123,6 @@ ClientUtil.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -184,7 +182,6 @@ Util.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -211,11 +208,11 @@ Util.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -224,7 +221,6 @@ Util.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -235,6 +231,7 @@ Util.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -262,7 +259,6 @@ Util.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -295,7 +291,6 @@ FileInfo.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -307,8 +302,9 @@ FileInfo.obj: \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\IcePatch2\Config.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -322,13 +318,14 @@ FileInfo.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ FileServer.obj: \ FileServer.cpp \ @@ -347,7 +344,6 @@ FileServer.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -384,12 +380,12 @@ FileServer.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -404,6 +400,7 @@ FileServer.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ diff --git a/cpp/src/IceSSL/.depend.mak b/cpp/src/IceSSL/.depend.mak index 584df2f588c..b75ca6003ea 100755 --- a/cpp/src/IceSSL/.depend.mak +++ b/cpp/src/IceSSL/.depend.mak @@ -33,7 +33,6 @@ ConnectionInfo.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -70,12 +69,12 @@ ConnectionInfo.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -90,6 +89,7 @@ ConnectionInfo.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ + "$(includedir)\Ice\OutputStream.h" \ EndpointInfo.obj: \ EndpointInfo.cpp \ @@ -108,7 +108,6 @@ EndpointInfo.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -122,8 +121,9 @@ EndpointInfo.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -136,13 +136,14 @@ EndpointInfo.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ AcceptorI.obj: \ AcceptorI.cpp \ @@ -169,7 +170,6 @@ AcceptorI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -206,12 +206,12 @@ AcceptorI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -220,7 +220,6 @@ AcceptorI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\src\Ice\ProtocolInstanceF.h" \ "InstanceF.h" \ "EndpointI.h" \ @@ -249,6 +248,7 @@ AcceptorI.obj: \ "..\..\src\Ice\ACM.h" \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "..\..\src\Ice\EndpointFactoryManagerF.h" \ "..\..\src\Ice\RetryQueueF.h" \ @@ -267,6 +267,7 @@ AcceptorI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -286,7 +287,6 @@ AcceptorI.obj: \ "SChannelTransceiverI.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\ImplicitContextF.h" \ @@ -322,7 +322,6 @@ Certificate.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -358,12 +357,11 @@ Certificate.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -400,7 +398,6 @@ ConnectorI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -437,12 +434,12 @@ ConnectorI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -451,7 +448,6 @@ ConnectorI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\src\Ice\ProtocolInstanceF.h" \ "InstanceF.h" \ "Instance.h" \ @@ -474,6 +470,7 @@ ConnectorI.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "..\..\src\Ice\EndpointFactoryManagerF.h" \ "..\..\src\Ice\RetryQueueF.h" \ @@ -493,6 +490,7 @@ ConnectorI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -518,7 +516,6 @@ ConnectorI.obj: \ "$(includedir)\IceSSL\EndpointInfo.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\ImplicitContextF.h" \ @@ -548,7 +545,6 @@ EndpointI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -597,19 +593,18 @@ EndpointI.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\src\Ice\ProtocolInstanceF.h" \ "..\..\src\Ice\EndpointFactory.h" \ "..\..\src\Ice\EndpointFactoryF.h" \ @@ -630,6 +625,7 @@ EndpointI.obj: \ "..\..\src\Ice\ACM.h" \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "..\..\src\Ice\EndpointFactoryManagerF.h" \ "..\..\src\Ice\RetryQueueF.h" \ @@ -648,6 +644,7 @@ EndpointI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -686,7 +683,6 @@ Instance.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -723,12 +719,12 @@ Instance.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -737,7 +733,6 @@ Instance.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\src\Ice\EndpointIF.h" \ "..\..\src\Ice\ConnectorF.h" \ "..\..\src\Ice\IPEndpointIF.h" \ @@ -758,6 +753,7 @@ Instance.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "..\..\src\Ice\EndpointFactoryManagerF.h" \ "..\..\src\Ice\RetryQueueF.h" \ @@ -778,6 +774,7 @@ Instance.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -813,7 +810,6 @@ PluginI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -853,12 +849,11 @@ PluginI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -892,6 +887,7 @@ PluginI.obj: \ "$(includedir)\Ice\ConnectionFactoryF.h" \ "..\..\src\Ice\ACM.h" \ "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "..\..\src\Ice\EndpointFactoryManagerF.h" \ "..\..\src\Ice\RetryQueueF.h" \ @@ -911,6 +907,7 @@ PluginI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -950,7 +947,6 @@ RFC2253.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -990,12 +986,11 @@ RFC2253.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1027,7 +1022,6 @@ SChannelEngine.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1067,12 +1061,11 @@ SChannelEngine.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1098,6 +1091,7 @@ SChannelEngine.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1137,7 +1131,6 @@ SChannelTransceiverI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1176,12 +1169,11 @@ SChannelTransceiverI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1219,6 +1211,7 @@ SChannelTransceiverI.obj: \ "$(includedir)\Ice\ConnectionFactoryF.h" \ "..\..\src\Ice\ACM.h" \ "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "..\..\src\Ice\EndpointFactoryManagerF.h" \ "..\..\src\Ice\RetryQueueF.h" \ @@ -1237,6 +1230,7 @@ SChannelTransceiverI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -1248,7 +1242,6 @@ SChannelTransceiverI.obj: \ "TrustManagerF.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\ImplicitContextF.h" \ @@ -1277,7 +1270,6 @@ SSLEngine.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1317,12 +1309,11 @@ SSLEngine.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1350,6 +1341,7 @@ SSLEngine.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1384,7 +1376,6 @@ TrustManager.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1427,12 +1418,11 @@ TrustManager.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1450,6 +1440,7 @@ TrustManager.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1495,7 +1486,6 @@ Util.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1531,12 +1521,11 @@ Util.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp index 5cf6c05cd90..b665c58e29d 100644 --- a/cpp/src/IceSSL/EndpointI.cpp +++ b/cpp/src/IceSSL/EndpointI.cpp @@ -11,7 +11,8 @@ #include <IceSSL/AcceptorI.h> #include <IceSSL/ConnectorI.h> #include <IceSSL/Instance.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> #include <Ice/DefaultsAndOverrides.h> #include <Ice/Object.h> @@ -42,7 +43,7 @@ IceSSL::EndpointI::EndpointI(const InstancePtr& instance) : { } -IceSSL::EndpointI::EndpointI(const InstancePtr& instance, IceInternal::BasicStream* s) : +IceSSL::EndpointI::EndpointI(const InstancePtr& instance, Ice::InputStream* s) : IPEndpointI(instance, s), _instance(instance), _timeout(-1), @@ -242,7 +243,7 @@ IceSSL::EndpointI::operator<(const Ice::LocalObject& r) const } void -IceSSL::EndpointI::streamWriteImpl(IceInternal::BasicStream* s) const +IceSSL::EndpointI::streamWriteImpl(Ice::OutputStream* s) const { IPEndpointI::streamWriteImpl(s); s->write(_timeout); @@ -361,7 +362,7 @@ IceSSL::EndpointFactoryI::create(vector<string>& args, bool oaEndpoint) const } IceInternal::EndpointIPtr -IceSSL::EndpointFactoryI::read(IceInternal::BasicStream* s) const +IceSSL::EndpointFactoryI::read(Ice::InputStream* s) const { return ICE_MAKE_SHARED(EndpointI, _instance, s); } diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h index 1bab9fac9e3..5910fed078d 100644 --- a/cpp/src/IceSSL/EndpointI.h +++ b/cpp/src/IceSSL/EndpointI.h @@ -28,7 +28,7 @@ public: EndpointI(const InstancePtr&, const std::string&, Ice::Int, const IceInternal::Address&, Ice::Int, const std::string&, bool); EndpointI(const InstancePtr&); - EndpointI(const InstancePtr&, IceInternal::BasicStream*); + EndpointI(const InstancePtr&, Ice::InputStream*); virtual Ice::EndpointInfoPtr getInfo() const; virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const; @@ -57,7 +57,7 @@ public: protected: - virtual void streamWriteImpl(IceInternal::BasicStream*) const; + virtual void streamWriteImpl(Ice::OutputStream*) const; virtual void hashInit(Ice::Int&) const; virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const; virtual bool checkOption(const std::string&, const std::string&, const std::string&); @@ -85,7 +85,7 @@ public: virtual Ice::Short type() const; virtual std::string protocol() const; virtual IceInternal::EndpointIPtr create(std::vector<std::string>&, bool) const; - virtual IceInternal::EndpointIPtr read(IceInternal::BasicStream*) const; + virtual IceInternal::EndpointIPtr read(Ice::InputStream*) const; virtual void destroy(); virtual IceInternal::EndpointFactoryPtr clone(const IceInternal::ProtocolInstancePtr&) const; diff --git a/cpp/src/IceStorm/.depend.mak b/cpp/src/IceStorm/.depend.mak index f48494e7ff7..e8cabb73e5c 100755 --- a/cpp/src/IceStorm/.depend.mak +++ b/cpp/src/IceStorm/.depend.mak @@ -99,7 +99,6 @@ Instance.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -136,12 +135,12 @@ Instance.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -157,6 +156,7 @@ Instance.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -174,7 +174,6 @@ Instance.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -205,7 +204,6 @@ Instance.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -253,7 +251,6 @@ InstrumentationI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -291,12 +288,12 @@ InstrumentationI.obj: \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -311,6 +308,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -323,7 +321,6 @@ InstrumentationI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -384,7 +381,6 @@ NodeI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -411,11 +407,11 @@ NodeI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -424,7 +420,6 @@ NodeI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -435,6 +430,7 @@ NodeI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +458,6 @@ NodeI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +514,6 @@ Observers.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -549,12 +543,12 @@ Observers.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +557,6 @@ Observers.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +568,7 @@ Observers.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +597,6 @@ Observers.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -651,7 +644,6 @@ Service.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -693,12 +685,11 @@ Service.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -712,6 +703,7 @@ Service.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -760,7 +752,6 @@ Service.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -816,7 +807,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -853,12 +843,12 @@ Subscriber.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -873,6 +863,7 @@ Subscriber.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -894,7 +885,6 @@ Subscriber.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -925,7 +915,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -962,7 +951,6 @@ TopicI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -999,12 +987,12 @@ TopicI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1019,6 +1007,7 @@ TopicI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -1038,7 +1027,6 @@ TopicI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1069,7 +1057,6 @@ TopicI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1110,7 +1097,6 @@ TopicManagerI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1147,12 +1133,12 @@ TopicManagerI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1167,6 +1153,7 @@ TopicManagerI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -1181,7 +1168,6 @@ TopicManagerI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1212,7 +1198,6 @@ TopicManagerI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1259,7 +1244,6 @@ TraceLevels.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1296,12 +1280,12 @@ TraceLevels.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1310,7 +1294,6 @@ TraceLevels.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1318,6 +1301,7 @@ TraceLevels.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1342,7 +1326,6 @@ TransientTopicI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1379,12 +1362,12 @@ TransientTopicI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1399,6 +1382,7 @@ TransientTopicI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -1419,7 +1403,6 @@ TransientTopicI.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1450,7 +1433,6 @@ TransientTopicI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1484,7 +1466,6 @@ TransientTopicManagerI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1521,12 +1502,12 @@ TransientTopicManagerI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1541,6 +1522,7 @@ TransientTopicManagerI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -1555,7 +1537,6 @@ TransientTopicManagerI.obj: \ "TransientTopicI.h" \ "TraceLevels.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "Instance.h" \ "Instrumentation.h" \ "Util.h" \ @@ -1594,7 +1575,6 @@ TransientTopicManagerI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1639,7 +1619,6 @@ Util.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1669,12 +1648,12 @@ Util.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1683,7 +1662,6 @@ Util.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1695,6 +1673,7 @@ Util.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1723,7 +1702,6 @@ Util.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1763,7 +1741,6 @@ Election.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1800,12 +1777,12 @@ Election.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1820,6 +1797,7 @@ Election.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -1853,7 +1831,6 @@ IceStormInternal.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1890,12 +1867,12 @@ IceStormInternal.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1910,6 +1887,7 @@ IceStormInternal.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -1944,7 +1922,6 @@ Instrumentation.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1981,12 +1958,12 @@ Instrumentation.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2001,6 +1978,7 @@ Instrumentation.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -2032,7 +2010,6 @@ LinkRecord.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2069,12 +2046,12 @@ LinkRecord.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2089,6 +2066,7 @@ LinkRecord.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -2124,7 +2102,6 @@ LLURecord.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2134,8 +2111,9 @@ LLURecord.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -2149,13 +2127,14 @@ LLURecord.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ SubscriberRecord.obj: \ SubscriberRecord.cpp \ @@ -2174,7 +2153,6 @@ SubscriberRecord.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2211,12 +2189,12 @@ SubscriberRecord.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2231,6 +2209,7 @@ SubscriberRecord.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -2277,7 +2256,6 @@ Admin.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2307,12 +2285,12 @@ Admin.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2321,7 +2299,6 @@ Admin.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -2333,6 +2310,7 @@ Admin.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -2360,7 +2338,6 @@ Admin.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -2407,7 +2384,6 @@ Parser.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2437,12 +2413,12 @@ Parser.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2451,7 +2427,6 @@ Parser.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -2463,6 +2438,7 @@ Parser.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -2491,7 +2467,6 @@ Parser.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -2541,7 +2516,6 @@ Grammar.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2571,12 +2545,12 @@ Grammar.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2585,7 +2559,6 @@ Grammar.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -2597,6 +2570,7 @@ Grammar.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -2625,7 +2599,6 @@ Grammar.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -2672,7 +2645,6 @@ Scanner.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2702,12 +2674,12 @@ Scanner.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2716,7 +2688,6 @@ Scanner.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -2728,6 +2699,7 @@ Scanner.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -2756,7 +2728,6 @@ Scanner.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -2806,7 +2777,6 @@ IceStormDB.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2836,12 +2806,12 @@ IceStormDB.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2850,7 +2820,6 @@ IceStormDB.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -2862,6 +2831,7 @@ IceStormDB.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -2889,7 +2859,6 @@ IceStormDB.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -2931,7 +2900,6 @@ DBTypes.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2968,12 +2936,12 @@ DBTypes.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2988,6 +2956,7 @@ DBTypes.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp index d5b8fe416e4..6e68f4f8183 100644 --- a/cpp/src/IceStorm/IceStormDB.cpp +++ b/cpp/src/IceStorm/IceStormDB.cpp @@ -169,6 +169,14 @@ Client::run(int argc, char* argv[]) fs.seekg(0, ios::end); streampos fileSize = fs.tellg(); + + if(!fileSize) + { + fs.close(); + cerr << "Empty input file" << endl; + return EXIT_FAILURE; + } + fs.seekg(0, ios::beg); vector<Ice::Byte> buf; @@ -180,15 +188,15 @@ Client::run(int argc, char* argv[]) string type; int version; - Ice::InputStreamPtr stream = Ice::wrapInputStream(communicator(), buf, dbContext.encoding); - stream->read(type); + Ice::InputStream stream(communicator(), dbContext.encoding, buf); + stream.read(type); if(type != "IceStorm") { cerr << "Incorrect input file type: " << type << endl; return EXIT_FAILURE; } - stream->read(version); - stream->read(data); + stream.read(version); + stream.read(data); { IceDB::Env env(dbPath, 2, mapSize); @@ -199,7 +207,7 @@ Client::run(int argc, char* argv[]) cout << "Writing LLU Map:" << endl; } - IceDB::Dbi<string, LogUpdate, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::Dbi<string, LogUpdate, IceDB::IceContext, Ice::OutputStream> lluMap(txn, "llu", dbContext, MDB_CREATE); for(StringLogUpdateDict::const_iterator p = data.llus.begin(); p != data.llus.end(); ++p) @@ -216,7 +224,7 @@ Client::run(int argc, char* argv[]) cout << "Writing Subscriber Map:" << endl; } - IceDB::Dbi<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::Dbi<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStream> subscriberMap(txn, "subscribers", dbContext, MDB_CREATE); for(SubscriberRecordDict::const_iterator q = data.subscribers.begin(); q != data.subscribers.end(); ++q) @@ -246,13 +254,12 @@ Client::run(int argc, char* argv[]) cout << "Reading LLU Map:" << endl; } - IceDB::Dbi<string, LogUpdate, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::Dbi<string, LogUpdate, IceDB::IceContext, Ice::OutputStream> lluMap(txn, "llu", dbContext, 0); string s; LogUpdate llu; - IceDB::ReadOnlyCursor<string, LogUpdate, IceDB::IceContext, Ice::OutputStreamPtr> - lluCursor(lluMap, txn); + IceDB::ReadOnlyCursor<string, LogUpdate, IceDB::IceContext, Ice::OutputStream> lluCursor(lluMap, txn); while(lluCursor.get(s, llu, MDB_NEXT)) { if(debug) @@ -268,12 +275,12 @@ Client::run(int argc, char* argv[]) cout << "Reading Subscriber Map:" << endl; } - IceDB::Dbi<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::Dbi<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStream> subscriberMap(txn, "subscribers", dbContext, 0); SubscriberRecordKey key; SubscriberRecord record; - IceDB::ReadOnlyCursor<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStreamPtr> + IceDB::ReadOnlyCursor<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStream> subCursor(subscriberMap, txn); while(subCursor.get(key, record, MDB_NEXT)) { @@ -290,11 +297,10 @@ Client::run(int argc, char* argv[]) env.close(); } - Ice::OutputStreamPtr stream = Ice::createOutputStream(communicator(), dbContext.encoding); - stream->write("IceStorm"); - stream->write(ICE_INT_VERSION); - stream->write(data); - pair<const Ice::Byte*, const Ice::Byte*> buf = stream->finished(); + Ice::OutputStream stream(communicator(), dbContext.encoding); + stream.write("IceStorm"); + stream.write(ICE_INT_VERSION); + stream.write(data); ofstream fs(dbFile.c_str(), ios::binary); if(fs.fail()) @@ -302,7 +308,7 @@ Client::run(int argc, char* argv[]) cerr << "Could not open output file: " << strerror(errno) << endl; return EXIT_FAILURE; } - fs.write(reinterpret_cast<const char*>(buf.first), buf.second - buf.first); + fs.write(reinterpret_cast<const char*>(stream.b.begin()), stream.b.size()); fs.close(); } } diff --git a/cpp/src/IceStorm/Instance.h b/cpp/src/IceStorm/Instance.h index 49e7edaa089..fd328d03862 100644 --- a/cpp/src/IceStorm/Instance.h +++ b/cpp/src/IceStorm/Instance.h @@ -118,7 +118,7 @@ private: }; typedef IceUtil::Handle<Instance> InstancePtr; -typedef IceDB::ReadWriteCursor<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStreamPtr> +typedef IceDB::ReadWriteCursor<SubscriberRecordKey, SubscriberRecord, IceDB::IceContext, Ice::OutputStream> SubscriberMapRWCursor; class PersistentInstance : public Instance diff --git a/cpp/src/IceStorm/Util.cpp b/cpp/src/IceStorm/Util.cpp index d59775e6044..089daa6b9b6 100644 --- a/cpp/src/IceStorm/Util.cpp +++ b/cpp/src/IceStorm/Util.cpp @@ -74,8 +74,8 @@ int IceStormInternal::compareSubscriberRecordKey(const MDB_val* v1, const MDB_val* v2) { SubscriberRecordKey k1, k2; - IceDB::Codec<SubscriberRecordKey, IceDB::IceContext, Ice::OutputStreamPtr>::read(k1, *v1, dbContext); - IceDB::Codec<SubscriberRecordKey, IceDB::IceContext, Ice::OutputStreamPtr>::read(k2, *v2, dbContext); + IceDB::Codec<SubscriberRecordKey, IceDB::IceContext, Ice::OutputStream>::read(k1, *v1, dbContext); + IceDB::Codec<SubscriberRecordKey, IceDB::IceContext, Ice::OutputStream>::read(k2, *v2, dbContext); if(k1 < k2) { return -1; diff --git a/cpp/src/IceStorm/Util.h b/cpp/src/IceStorm/Util.h index cb8184e8476..c0f6bbf4744 100644 --- a/cpp/src/IceStorm/Util.h +++ b/cpp/src/IceStorm/Util.h @@ -24,9 +24,9 @@ namespace IceStorm class Instance; typedef IceUtil::Handle<Instance> InstancePtr; -typedef IceDB::Dbi<IceStorm::SubscriberRecordKey, IceStorm::SubscriberRecord, IceDB::IceContext, Ice::OutputStreamPtr> +typedef IceDB::Dbi<IceStorm::SubscriberRecordKey, IceStorm::SubscriberRecord, IceDB::IceContext, Ice::OutputStream> SubscriberMap; -typedef IceDB::Dbi<std::string, IceStormElection::LogUpdate, IceDB::IceContext, Ice::OutputStreamPtr> LLUMap; +typedef IceDB::Dbi<std::string, IceStormElection::LogUpdate, IceDB::IceContext, Ice::OutputStream> LLUMap; const std::string lluDbKey = "_manager"; diff --git a/cpp/src/IceStormLib/.depend.mak b/cpp/src/IceStormLib/.depend.mak index b829883024a..4c3e3a981e8 100755 --- a/cpp/src/IceStormLib/.depend.mak +++ b/cpp/src/IceStormLib/.depend.mak @@ -29,7 +29,6 @@ IceStorm.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -66,12 +65,12 @@ IceStorm.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -86,6 +85,7 @@ IceStorm.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -117,7 +117,6 @@ Metrics.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -154,12 +153,12 @@ Metrics.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -174,6 +173,7 @@ Metrics.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ diff --git a/cpp/src/iceserviceinstall/.depend.mak b/cpp/src/iceserviceinstall/.depend.mak index aaccb39b00b..2dcbab7a06e 100755 --- a/cpp/src/iceserviceinstall/.depend.mak +++ b/cpp/src/iceserviceinstall/.depend.mak @@ -29,7 +29,6 @@ ServiceInstaller.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -59,12 +58,12 @@ ServiceInstaller.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -73,7 +72,6 @@ ServiceInstaller.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -85,6 +83,7 @@ ServiceInstaller.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -113,7 +112,6 @@ ServiceInstaller.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -161,7 +159,6 @@ Install.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -191,12 +188,12 @@ Install.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -205,7 +202,6 @@ Install.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -217,6 +213,7 @@ Install.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -245,7 +242,6 @@ Install.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 789be476a40..bdc5e986be7 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -270,7 +270,7 @@ writeDataMemberInitializers(IceUtilInternal::Output& C, const DataMemberList& me Slice::Gen::Gen(const string& base, const string& headerExtension, const string& sourceExtension, const vector<string>& extraHeaders, const string& include, const vector<string>& includePaths, const string& dllExport, const string& dir, - bool implCpp98, bool implCpp11, bool checksum, bool stream, bool ice) : + bool implCpp98, bool implCpp11, bool checksum, bool ice) : _base(base), _headerExtension(headerExtension), _implHeaderExtension(headerExtension), @@ -283,7 +283,6 @@ Slice::Gen::Gen(const string& base, const string& headerExtension, const string& _implCpp98(implCpp98), _implCpp11(implCpp11), _checksum(checksum), - _stream(stream), _ice(ice) { for(vector<string>::iterator p = _includePaths.begin(); p != _includePaths.end(); ++p) @@ -517,22 +516,13 @@ Slice::Gen::generate(const UnitPtr& p) if(p->usesNonLocals()) { - C << "\n#include <Ice/BasicStream.h>"; + C << "\n#include <Ice/InputStream.h>"; + C << "\n#include <Ice/OutputStream.h>"; } - if(_stream || p->hasNonLocalClassDefs() || p->hasNonLocalExceptions()) + if(p->hasNonLocalExceptions()) { - if(!p->hasNonLocalClassDefs()) - { - C << "\n#include <Ice/LocalException.h>"; - } - - H << "\n#include <Ice/StreamF.h>"; - - if(_stream) - { - C << "\n#include <Ice/Stream.h>"; - } + C << "\n#include <Ice/LocalException.h>"; } if(p->hasContentsWithMetaData("preserve-slice")) @@ -616,13 +606,13 @@ Slice::Gen::generate(const UnitPtr& p) Cpp11ProxyVisitor proxyVisitor(H, C, _dllExport); p->visit(&proxyVisitor, false); - Cpp11LocalObjectVisitor localObjectVisitor(H, C, _dllExport, _stream); + Cpp11LocalObjectVisitor localObjectVisitor(H, C, _dllExport); p->visit(&localObjectVisitor, false); - Cpp11InterfaceVisitor interfaceVisitor(H, C, _dllExport, _stream); + Cpp11InterfaceVisitor interfaceVisitor(H, C, _dllExport); p->visit(&interfaceVisitor, false); - Cpp11ValueVisitor valueVisitor(H, C, _dllExport, _stream); + Cpp11ValueVisitor valueVisitor(H, C, _dllExport); p->visit(&valueVisitor, false); if(_implCpp11) @@ -668,7 +658,7 @@ Slice::Gen::generate(const UnitPtr& p) ObjectDeclVisitor objectDeclVisitor(H, C, _dllExport); p->visit(&objectDeclVisitor, false); - TypesVisitor typesVisitor(H, C, _dllExport, _stream); + TypesVisitor typesVisitor(H, C, _dllExport); p->visit(&typesVisitor, false); StreamVisitor streamVisitor(H, C, _dllExport); @@ -692,7 +682,7 @@ Slice::Gen::generate(const UnitPtr& p) ProxyVisitor proxyVisitor(H, C, _dllExport); p->visit(&proxyVisitor, false); - ObjectVisitor objectVisitor(H, C, _dllExport, _stream); + ObjectVisitor objectVisitor(H, C, _dllExport); p->visit(&objectVisitor, false); // @@ -775,8 +765,8 @@ Slice::Gen::writeExtraHeaders(IceUtilInternal::Output& out) } } -Slice::Gen::TypesVisitor::TypesVisitor(Output& h, Output& c, const string& dllExport, bool stream) : - H(h), C(c), _dllExport(dllExport), _stream(stream), _doneStaticSymbol(false), _useWstring(false) +Slice::Gen::TypesVisitor::TypesVisitor(Output& h, Output& c, const string& dllExport) : + H(h), C(c), _dllExport(dllExport), _doneStaticSymbol(false), _useWstring(false) { } @@ -1061,126 +1051,66 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) if(preserved && !basePreserved) { - H << sp << nl << "virtual void __write(::IceInternal::BasicStream*) const;"; - H << nl << "virtual void __read(::IceInternal::BasicStream*);"; + H << sp << nl << "virtual void __write(::Ice::OutputStream*) const;"; + H << nl << "virtual void __read(::Ice::InputStream*);"; - if(_stream) - { - H << nl << "virtual void __write(const ::Ice::OutputStreamPtr&) const;"; - H << nl << "virtual void __read(const ::Ice::InputStreamPtr&);"; - } - else - { - string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException"); - H << nl << "using " << baseName << "::__write;"; - H << nl << "using " << baseName << "::__read;"; - } + string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException"); + H << nl << "using " << baseName << "::__write;"; + H << nl << "using " << baseName << "::__read;"; } H.dec(); H << sp << nl << "protected:"; H.inc(); - H << nl << "virtual void __writeImpl(::IceInternal::BasicStream*) const;"; - H << nl << "virtual void __readImpl(::IceInternal::BasicStream*);"; + H << nl << "virtual void __writeImpl(::Ice::OutputStream*) const;"; + H << nl << "virtual void __readImpl(::Ice::InputStream*);"; - if(_stream) - { - H << nl << "virtual void __writeImpl(const ::Ice::OutputStreamPtr&) const;"; - H << nl << "virtual void __readImpl(const ::Ice::InputStreamPtr&);"; - } - else - { - string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException"); - H << nl << "using " << baseName << "::__writeImpl;"; - H << nl << "using " << baseName << "::__readImpl;"; - } + string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException"); + H << nl << "using " << baseName << "::__writeImpl;"; + H << nl << "using " << baseName << "::__readImpl;"; if(preserved && !basePreserved) { H << sp << nl << "::Ice::SlicedDataPtr __slicedData;"; - C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::BasicStream* __os) const"; + C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(::Ice::OutputStream* __os) const"; C << sb; - C << nl << "__os->startWriteException(__slicedData);"; + C << nl << "__os->startException(__slicedData);"; C << nl << "__writeImpl(__os);"; - C << nl << "__os->endWriteException();"; + C << nl << "__os->endException();"; C << eb; - C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)"; + C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(::Ice::InputStream* __is)"; C << sb; - C << nl << "__is->startReadException();"; + C << nl << "__is->startException();"; C << nl << "__readImpl(__is);"; - C << nl << "__slicedData = __is->endReadException(true);"; + C << nl << "__slicedData = __is->endException(true);"; C << eb; } - C << sp << nl << "void" << nl << scoped.substr(2) << "::__writeImpl(::IceInternal::BasicStream* __os) const"; + C << sp << nl << "void" << nl << scoped.substr(2) << "::__writeImpl(::Ice::OutputStream* __os) const"; C << sb; - C << nl << "__os->startWriteSlice(\"" << p->scoped() << "\", -1, " << (!base ? "true" : "false") << ");"; + C << nl << "__os->startSlice(\"" << p->scoped() << "\", -1, " << (!base ? "true" : "false") << ");"; writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true); - C << nl << "__os->endWriteSlice();"; + C << nl << "__os->endSlice();"; if(base) { emitUpcall(base, "::__writeImpl(__os);"); } C << eb; - C << sp << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::IceInternal::BasicStream* __is)"; + C << sp << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::Ice::InputStream* __is)"; C << sb; - C << nl << "__is->startReadSlice();"; + C << nl << "__is->startSlice();"; writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false); - C << nl << "__is->endReadSlice();"; + C << nl << "__is->endSlice();"; if(base) { emitUpcall(base, "::__readImpl(__is);"); } C << eb; - - if(_stream) - { - if(preserved && !basePreserved) - { - C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(const ::Ice::OutputStreamPtr& __os) const"; - C << sb; - C << nl << "__os->startException(__slicedData);"; - C << nl << "__writeImpl(__os);"; - C << nl << "__os->endException();"; - C << eb; - - C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(const ::Ice::InputStreamPtr& __is)"; - C << sb; - C << nl << "__is->startException();"; - C << nl << "__readImpl(__is);"; - C << nl << "__slicedData = __is->endException(true);"; - C << eb; - } - - C << sp << nl << "void" << nl << scoped.substr(2) - << "::__writeImpl(const ::Ice::OutputStreamPtr& __os) const"; - C << sb; - C << nl << "__os->startSlice(\"" << p->scoped() << "\", -1, " << (!base ? "true" : "false") << ");"; - writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true); - C << nl << "__os->endSlice();"; - if(base) - { - emitUpcall(base, "::__writeImpl(__os);"); - } - C << eb; - - C << sp << nl << "void" << nl << scoped.substr(2) - << "::__readImpl(const ::Ice::InputStreamPtr& __is)"; - C << sb; - C << nl << "__is->startSlice();"; - writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false); - C << nl << "__is->endSlice();"; - if(base) - { - emitUpcall(base, "::__readImpl(__is);"); - } - C << eb; - } } H << eb << ';'; @@ -1546,7 +1476,7 @@ Slice::Gen::ProxyDeclVisitor::visitClassDecl(const ClassDeclPtr& p) string scoped = fixKwd(p->scoped()); H << sp << nl << "class " << name << ';'; - H << nl << _dllExport << "void __read(::IceInternal::BasicStream*, ::IceInternal::ProxyHandle< ::IceProxy" + H << nl << _dllExport << "void __read(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy" << scoped << ">&);"; H << nl << _dllExport << "::IceProxy::Ice::Object* upCast(::IceProxy" << scoped << "*);"; } @@ -1680,7 +1610,7 @@ Slice::Gen::ProxyVisitor::visitClassDefStart(const ClassDefPtr& p) << "* p) { return p; }"; C << sp; - C << nl << "void" << nl << "::IceProxy" << scope << "__read(::IceInternal::BasicStream* __is, " + C << nl << "void" << nl << "::IceProxy" << scope << "__read(::Ice::InputStream* __is, " << "::IceInternal::ProxyHandle< ::IceProxy" << scoped << ">& v)"; C << sb; C << nl << "::Ice::ObjectPrx proxy;"; @@ -1930,7 +1860,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) { C << nl << "try"; C << sb; - C << nl<< "::IceInternal::BasicStream* __os = __og.startWriteParams(" << opFormatTypeToString(p) << ");"; + C << nl<< "::Ice::OutputStream* __os = __og.startWriteParams(" << opFormatTypeToString(p) << ");"; writeMarshalCode(C, inParams, 0, true, TypeContextInParam); if(p->sendsClasses(false)) { @@ -2009,7 +1939,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) if(ret || !outParams.empty()) { writeAllocateCode(C, ParamDeclList(), p, true, _useWstring); - C << nl << "::IceInternal::BasicStream* __is = __og.startReadParams();"; + C << nl << "::Ice::InputStream* __is = __og.startReadParams();"; writeUnmarshalCode(C, outParams, p, true); if(p->returnsClasses(false)) { @@ -2044,7 +1974,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) } else { - C << nl << "::IceInternal::BasicStream* __os = __result->startWriteParams(" << opFormatTypeToString(p) <<");"; + C << nl << "::Ice::OutputStream* __os = __result->startWriteParams(" << opFormatTypeToString(p) <<");"; writeMarshalCode(C, inParams, 0, true, TypeContextInParam); if(p->sendsClasses(false)) { @@ -2107,7 +2037,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) C << eb; if(ret || !outParams.empty()) { - C << nl << "::IceInternal::BasicStream* __is = __result->__startReadParams();"; + C << nl << "::Ice::InputStream* __is = __result->__startReadParams();"; writeUnmarshalCode(C, outParams, p, true, _useWstring | TypeContextAMIEnd); if(p->returnsClasses(false)) { @@ -2171,7 +2101,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) if(ret || !outParams.empty()) { - C << nl << "::IceInternal::BasicStream* __is = __result->__startReadParams();"; + C << nl << "::Ice::InputStream* __is = __result->__startReadParams();"; writeUnmarshalCode(C, outParams, p, true, _useWstring | TypeContextAMIPrivateEnd); if(p->returnsClasses(false)) { @@ -2249,8 +2179,8 @@ Slice::Gen::ObjectDeclVisitor::visitOperation(const OperationPtr& p) } } -Slice::Gen::ObjectVisitor::ObjectVisitor(Output& h, Output& c, const string& dllExport, bool stream) : - H(h), C(c), _dllExport(dllExport), _stream(stream), _doneStaticSymbol(false), _useWstring(false) +Slice::Gen::ObjectVisitor::ObjectVisitor(Output& h, Output& c, const string& dllExport) : + H(h), C(c), _dllExport(dllExport), _doneStaticSymbol(false), _useWstring(false) { } @@ -2829,68 +2759,52 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p) if(preserved && !basePreserved) { H << sp; - H << nl << "virtual void __write(::IceInternal::BasicStream*) const;"; - H << nl << "virtual void __read(::IceInternal::BasicStream*);"; + H << nl << "virtual void __write(::Ice::OutputStream*) const;"; + H << nl << "virtual void __read(::Ice::InputStream*);"; - if(_stream) - { - H << nl << "virtual void __write(const ::Ice::OutputStreamPtr&) const;"; - H << nl << "virtual void __read(const ::Ice::InputStreamPtr&);"; - } - else - { - string baseName = base ? fixKwd(base->scoped()) : string("::Ice::Object"); - H << nl << "using " << baseName << "::__write;"; - H << nl << "using " << baseName << "::__read;"; - } + string baseName = base ? fixKwd(base->scoped()) : string("::Ice::Object"); + H << nl << "using " << baseName << "::__write;"; + H << nl << "using " << baseName << "::__read;"; } H.dec(); H << sp << nl << "protected:"; H.inc(); - H << nl << "virtual void __writeImpl(::IceInternal::BasicStream*) const;"; - H << nl << "virtual void __readImpl(::IceInternal::BasicStream*);"; + H << nl << "virtual void __writeImpl(::Ice::OutputStream*) const;"; + H << nl << "virtual void __readImpl(::Ice::InputStream*);"; - if(_stream) - { - H << nl << "virtual void __writeImpl(const ::Ice::OutputStreamPtr&) const;"; - H << nl << "virtual void __readImpl(const ::Ice::InputStreamPtr&);"; - } - else - { - string baseName = base ? fixKwd(base->scoped()) : string("::Ice::Object"); - H << nl << "using " << baseName << "::__writeImpl;"; - H << nl << "using " << baseName << "::__readImpl;"; - } + string baseName = base ? fixKwd(base->scoped()) : string("::Ice::Object"); + H << nl << "using " << baseName << "::__writeImpl;"; + H << nl << "using " << baseName << "::__readImpl;"; if(preserved && !basePreserved) { C << sp; C << nl << "void" << nl << scoped.substr(2) - << "::__write(::IceInternal::BasicStream* __os) const"; + << "::__write(::Ice::OutputStream* __os) const"; C << sb; - C << nl << "__os->startWriteObject(__slicedData);"; + C << nl << "__os->startObject(__slicedData);"; C << nl << "__writeImpl(__os);"; - C << nl << "__os->endWriteObject();"; + C << nl << "__os->endObject();"; C << eb; C << sp; - C << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)"; + C << nl << "void" << nl << scoped.substr(2) << "::__read(::Ice::InputStream* __is)"; C << sb; - C << nl << "__is->startReadObject();"; + C << nl << "__is->startObject();"; C << nl << "__readImpl(__is);"; - C << nl << "__slicedData = __is->endReadObject(true);"; + C << nl << "__slicedData = __is->endObject(true);"; C << eb; } C << sp; C << nl << "void" << nl << scoped.substr(2) - << "::__writeImpl(::IceInternal::BasicStream* __os) const"; + << "::__writeImpl(::Ice::OutputStream* __os) const"; C << sb; - C << nl << "__os->startWriteSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");"; + C << nl << "__os->startSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");"; writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true); - C << nl << "__os->endWriteSlice();"; + C << nl << "__os->endSlice();"; if(base) { emitUpcall(base, "::__writeImpl(__os);"); @@ -2898,60 +2812,17 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p) C << eb; C << sp; - C << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::IceInternal::BasicStream* __is)"; + C << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::Ice::InputStream* __is)"; C << sb; - C << nl << "__is->startReadSlice();"; + C << nl << "__is->startSlice();"; writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false); - C << nl << "__is->endReadSlice();"; + C << nl << "__is->endSlice();"; if(base) { emitUpcall(base, "::__readImpl(__is);"); } C << eb; - if(_stream) - { - if(preserved && !basePreserved) - { - C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(const ::Ice::OutputStreamPtr& __os) const"; - C << sb; - C << nl << "__os->startObject(__slicedData);"; - C << nl << "__writeImpl(__os);"; - C << nl << "__os->endObject();"; - C << eb; - - C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(const ::Ice::InputStreamPtr& __is)"; - C << sb; - C << nl << "__is->startObject();"; - C << nl << "__readImpl(__is);"; - C << nl << "__slicedData = __is->endObject(true);"; - C << eb; - } - - C << sp << nl << "void" << nl << scoped.substr(2) - << "::__writeImpl(const ::Ice::OutputStreamPtr& __os) const"; - C << sb; - C << nl << "__os->startSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");"; - writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true); - C << nl << "__os->endSlice();"; - if(base) - { - emitUpcall(base, "::__writeImpl(__os);"); - } - C << eb; - - C << sp << nl << "void" << nl << scoped.substr(2) << "::__readImpl(const ::Ice::InputStreamPtr& __is)"; - C << sb; - C << nl << "__is->startSlice();"; - writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false); - C << nl << "__is->endSlice();"; - if(base) - { - emitUpcall(base, "::__readImpl(__is);"); - } - C << eb; - } - if(!p->isAbstract() || p->compactId() >= 0) { C << sp << nl << "namespace"; @@ -3253,7 +3124,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p) if(!inParams.empty()) { - C << nl << "::IceInternal::BasicStream* __is = __inS.startReadParams();"; + C << nl << "::Ice::InputStream* __is = __inS.startReadParams();"; writeAllocateCode(C, inParams, 0, true, _useWstring | TypeContextInParam); writeUnmarshalCode(C, inParams, 0, true, TypeContextInParam); if(p->sendsClasses(false)) @@ -3281,7 +3152,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p) C << fixKwd(name) << args << ';'; if(ret || !outParams.empty()) { - C << nl << "::IceInternal::BasicStream* __os = __inS.__startWriteParams(" + C << nl << "::Ice::OutputStream* __os = __inS.__startWriteParams(" << opFormatTypeToString(p) << ");"; writeMarshalCode(C, outParams, p, true); if(p->returnsClasses(false)) @@ -3315,7 +3186,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p) if(!inParams.empty()) { - C << nl << "::IceInternal::BasicStream* __is = __inS.startReadParams();"; + C << nl << "::Ice::InputStream* __is = __inS.startReadParams();"; writeAllocateCode(C, inParams, 0, true, _useWstring | TypeContextInParam); writeUnmarshalCode(C, inParams, 0, true, TypeContextInParam); if(p->sendsClasses(false)) @@ -4620,7 +4491,7 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p) { C << nl << "try"; C << sb; - C << nl << "::IceInternal::BasicStream* __os = __startWriteParams(" << opFormatTypeToString(p) << ");"; + C << nl << "::Ice::OutputStream* __os = __startWriteParams(" << opFormatTypeToString(p) << ");"; writeMarshalCode(C, outParams, p, false, TypeContextInParam); if(p->returnsClasses(false)) { @@ -4801,16 +4672,20 @@ Slice::Gen::StreamVisitor::visitStructStart(const StructPtr& p) // H << nl << "#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined("; H << _dllExport.substr(0, _dllExport.size() - 1) + "_EXPORTS) && !defined(ICE_STATIC_LIBS)"; - H << nl << "template struct " << _dllExport << "StreamWriter< " << fullStructName << ", ::IceInternal::BasicStream>;"; - H << nl << "template struct " << _dllExport << "StreamReader< " << fullStructName << ", ::IceInternal::BasicStream>;"; + H << nl << "template struct " << _dllExport << "StreamWriter< " << fullStructName + << ", ::Ice::OutputStream>;"; + H << nl << "template struct " << _dllExport << "StreamReader< " << fullStructName + << ", ::Ice::InputStream>;"; H << nl << "#endif" << nl; // // The instantations: // C << nl << "#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)"; - C << nl << "template struct " << _dllExport << "StreamWriter< " << fullStructName << ", ::IceInternal::BasicStream>;"; - C << nl << "template struct " << _dllExport << "StreamReader< " << fullStructName << ", ::IceInternal::BasicStream>;"; + C << nl << "template struct " << _dllExport << "StreamWriter< " << fullStructName + << ", ::Ice::OutputStream>;"; + C << nl << "template struct " << _dllExport << "StreamReader< " << fullStructName + << ", ::Ice::InputStream>;"; C << nl << "#endif"; } } @@ -5487,9 +5362,8 @@ Slice::Gen::Cpp11TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) if(preserved && !basePreserved) { - H << sp << nl << "virtual void __write(::IceInternal::BasicStream*) const;"; - H << nl << "virtual void __read(::IceInternal::BasicStream*);"; - + H << sp << nl << "virtual void __write(::Ice::OutputStream*) const;"; + H << nl << "virtual void __read(::Ice::InputStream*);"; string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException"); } @@ -5498,45 +5372,45 @@ Slice::Gen::Cpp11TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) H << sp << nl << "protected:"; H.inc(); - H << nl << "virtual void __writeImpl(::IceInternal::BasicStream*) const;"; - H << nl << "virtual void __readImpl(::IceInternal::BasicStream*);"; + H << nl << "virtual void __writeImpl(::Ice::OutputStream*) const;"; + H << nl << "virtual void __readImpl(::Ice::InputStream*);"; if(preserved && !basePreserved) { H << sp << nl << "::std::shared_ptr<::Ice::SlicedData> __slicedData;"; - C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::BasicStream* __os) const"; + C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(::Ice::OutputStream* __os) const"; C << sb; - C << nl << "__os->startWriteException(__slicedData);"; + C << nl << "__os->startException(__slicedData);"; C << nl << "__writeImpl(__os);"; - C << nl << "__os->endWriteException();"; + C << nl << "__os->endException();"; C << eb; - C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)"; + C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(::Ice::InputStream* __is)"; C << sb; - C << nl << "__is->startReadException();"; + C << nl << "__is->startException();"; C << nl << "__readImpl(__is);"; - C << nl << "__slicedData = __is->endReadException(true);"; + C << nl << "__slicedData = __is->endException(true);"; C << eb; } - C << sp << nl << "void" << nl << scoped.substr(2) << "::__writeImpl(::IceInternal::BasicStream* __os) const"; + C << sp << nl << "void" << nl << scoped.substr(2) << "::__writeImpl(::Ice::OutputStream* __os) const"; C << sb; - C << nl << "__os->startWriteSlice(\"" << p->scoped() << "\", -1, " << (!base ? "true" : "false") << ");"; + C << nl << "__os->startSlice(\"" << p->scoped() << "\", -1, " << (!base ? "true" : "false") << ");"; writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true); - C << nl << "__os->endWriteSlice();"; + C << nl << "__os->endSlice();"; if(base) { emitUpcall(base, "::__writeImpl(__os);"); } C << eb; - C << sp << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::IceInternal::BasicStream* __is)"; + C << sp << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::Ice::InputStream* __is)"; C << sb; - C << nl << "__is->startReadSlice();"; + C << nl << "__is->startSlice();"; writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false); - C << nl << "__is->endReadSlice();"; + C << nl << "__is->endSlice();"; if(base) { emitUpcall(base, "::__readImpl(__is);"); @@ -6202,7 +6076,7 @@ Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) } else { - C << nl << "[&](::IceInternal::BasicStream* __os)"; + C << nl << "[&](::Ice::OutputStream* __os)"; C << sb; writeMarshalCode(C, inParams, 0, true, TypeContextInParam); if(p->sendsClasses(false)) @@ -6217,7 +6091,7 @@ Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) if(ret || !outParams.empty()) { C << nl << "false" << ","; - C << nl << "[__response](::IceInternal::BasicStream* __is)"; + C << nl << "[__response](::Ice::InputStream* __is)"; C << sb; writeAllocateCode(C, outParams, p, true, _useWstring | TypeContextAMIEnd | TypeContextReadClosure, true); writeUnmarshalCode(C, outParams, p, true, _useWstring | TypeContextAMIEnd); @@ -6225,7 +6099,7 @@ Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) { C << nl << "__is->readPendingObjects();"; } - C << nl << "__is->endReadEncaps();"; + C << nl << "__is->endEncapsulation();"; C << nl << "if(__response)"; C << sb; C << nl << "try"; @@ -6260,7 +6134,7 @@ Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) else { C << nl << "true" << ","; - C << nl << "[__response](::IceInternal::BasicStream*)"; + C << nl << "[__response](::Ice::InputStream*)"; C << sb; C << nl << "if(__response)"; C << sb; @@ -6556,12 +6430,10 @@ Slice::Gen::Cpp11TypesVisitor::emitUpcall(const ExceptionPtr& base, const string Slice::Gen::Cpp11ObjectVisitor::Cpp11ObjectVisitor(::IceUtilInternal::Output& h, ::IceUtilInternal::Output& c, - const std::string& dllExport, - bool stream) : + const std::string& dllExport) : H(h), C(c), _dllExport(dllExport), - _stream(stream), _doneStaticSymbol(false), _useWstring(false) { @@ -6596,9 +6468,8 @@ Slice::Gen::Cpp11ValueVisitor::emitUpcall(const ClassDefPtr& base, const string& Slice::Gen::Cpp11LocalObjectVisitor::Cpp11LocalObjectVisitor(::IceUtilInternal::Output& h, ::IceUtilInternal::Output& c, - const std::string& dllExport, - bool stream) : - Cpp11ObjectVisitor(h, c, dllExport, stream) + const std::string& dllExport) : + Cpp11ObjectVisitor(h, c, dllExport) { } @@ -6949,9 +6820,8 @@ Slice::Gen::Cpp11LocalObjectVisitor::visitOperation(const OperationPtr& p) Slice::Gen::Cpp11InterfaceVisitor::Cpp11InterfaceVisitor(::IceUtilInternal::Output& h, ::IceUtilInternal::Output& c, - const std::string& dllExport, - bool stream) : - Cpp11ObjectVisitor(h, c, dllExport, stream) + const std::string& dllExport) : + Cpp11ObjectVisitor(h, c, dllExport) { } @@ -7406,7 +7276,7 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p) if(!inParams.empty()) { - C << nl << "::IceInternal::BasicStream* __is = __inS.startReadParams();"; + C << nl << "::Ice::InputStream* __is = __inS.startReadParams();"; writeAllocateCode(C, inParams, 0, true, _useWstring | TypeContextInParam | TypeContextReadClosure, true); writeUnmarshalCode(C, inParams, 0, true, TypeContextInParam); if(p->sendsClasses(false)) @@ -7540,9 +7410,8 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p) Slice::Gen::Cpp11ValueVisitor::Cpp11ValueVisitor(::IceUtilInternal::Output& h, ::IceUtilInternal::Output& c, - const std::string& dllExport, - bool stream) : - Cpp11ObjectVisitor(h, c, dllExport, stream) + const std::string& dllExport) : + Cpp11ObjectVisitor(h, c, dllExport) { } @@ -7657,44 +7526,44 @@ Slice::Gen::Cpp11ValueVisitor::visitClassDefEnd(const ClassDefPtr& p) if(preserved && !basePreserved) { H << sp; - H << nl << "virtual void __write(::IceInternal::BasicStream*) const;"; - H << nl << "virtual void __read(::IceInternal::BasicStream*);"; + H << nl << "virtual void __write(::Ice::OutputStream*) const;"; + H << nl << "virtual void __read(::Ice::InputStream*);"; } H.dec(); H << sp << nl << "protected:"; H.inc(); - H << nl << "virtual void __writeImpl(::IceInternal::BasicStream*) const;"; - H << nl << "virtual void __readImpl(::IceInternal::BasicStream*);"; + H << nl << "virtual void __writeImpl(::Ice::OutputStream*) const;"; + H << nl << "virtual void __readImpl(::Ice::InputStream*);"; if(preserved && !basePreserved) { C << sp; C << nl << "void" << nl << scoped.substr(2) - << "::__write(::IceInternal::BasicStream* __os) const"; + << "::__write(::Ice::OutputStream* __os) const"; C << sb; - C << nl << "__os->startWriteObject(__slicedData);"; + C << nl << "__os->startObject(__slicedData);"; C << nl << "__writeImpl(__os);"; - C << nl << "__os->endWriteObject();"; + C << nl << "__os->endObject();"; C << eb; C << sp; - C << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)"; + C << nl << "void" << nl << scoped.substr(2) << "::__read(::Ice::InputStream* __is)"; C << sb; - C << nl << "__is->startReadObject();"; + C << nl << "__is->startObject();"; C << nl << "__readImpl(__is);"; - C << nl << "__slicedData = __is->endReadObject(true);"; + C << nl << "__slicedData = __is->endObject(true);"; C << eb; } C << sp; C << nl << "void" << nl << scoped.substr(2) - << "::__writeImpl(::IceInternal::BasicStream* __os) const"; + << "::__writeImpl(::Ice::OutputStream* __os) const"; C << sb; - C << nl << "__os->startWriteSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");"; + C << nl << "__os->startSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");"; writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true); - C << nl << "__os->endWriteSlice();"; + C << nl << "__os->endSlice();"; if(base) { emitUpcall(base, "::__writeImpl(__os);"); @@ -7702,11 +7571,11 @@ Slice::Gen::Cpp11ValueVisitor::visitClassDefEnd(const ClassDefPtr& p) C << eb; C << sp; - C << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::IceInternal::BasicStream* __is)"; + C << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::Ice::InputStream* __is)"; C << sb; - C << nl << "__is->startReadSlice();"; + C << nl << "__is->startSlice();"; writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false); - C << nl << "__is->endReadSlice();"; + C << nl << "__is->endSlice();"; if(base) { emitUpcall(base, "::__readImpl(__is);"); @@ -8035,16 +7904,16 @@ Slice::Gen::Cpp11StreamVisitor::visitStructStart(const StructPtr& p) // H << nl << "#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined("; H << _dllExport.substr(0, _dllExport.size() - 1) + "_EXPORTS) && !defined(ICE_STATIC_LIBS)"; - H << nl << "template struct " << _dllExport << "StreamWriter< " << scoped << ", ::IceInternal::BasicStream>;"; - H << nl << "template struct " << _dllExport << "StreamReader< " << scoped << ", ::IceInternal::BasicStream>;"; + H << nl << "template struct " << _dllExport << "StreamWriter< " << scoped << ", ::Ice::OutputStream>;"; + H << nl << "template struct " << _dllExport << "StreamReader< " << scoped << ", ::Ice::InputStream>;"; H << nl << "#endif" << nl; // // The instantations: // C << nl << "#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)"; - C << nl << "template struct " << _dllExport << "StreamWriter< " << scoped << ", ::IceInternal::BasicStream>;"; - C << nl << "template struct " << _dllExport << "StreamReader< " << scoped << ", ::IceInternal::BasicStream>;"; + C << nl << "template struct " << _dllExport << "StreamWriter< " << scoped << ", ::Ice::OutputStream>;"; + C << nl << "template struct " << _dllExport << "StreamReader< " << scoped << ", ::Ice::InputStream>;"; C << nl << "#endif"; } } diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h index 6b90d3ed391..03944065a74 100644 --- a/cpp/src/slice2cpp/Gen.h +++ b/cpp/src/slice2cpp/Gen.h @@ -31,7 +31,6 @@ public: bool, bool, bool, - bool, bool); ~Gen(); @@ -71,14 +70,13 @@ private: bool _implCpp98; bool _implCpp11; bool _checksum; - bool _stream; bool _ice; class TypesVisitor : private ::IceUtil::noncopyable, public ParserVisitor { public: - TypesVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool); + TypesVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); virtual bool visitModuleStart(const ModulePtr&); virtual void visitModuleEnd(const ModulePtr&); @@ -101,7 +99,6 @@ private: ::IceUtilInternal::Output& C; std::string _dllExport; - bool _stream; bool _doneStaticSymbol; int _useWstring; std::list<int> _useWstringHist; @@ -173,7 +170,7 @@ private: { public: - ObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool); + ObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); virtual bool visitModuleStart(const ModulePtr&); virtual void visitModuleEnd(const ModulePtr&); @@ -197,7 +194,6 @@ private: ::IceUtilInternal::Output& C; std::string _dllExport; - bool _stream; bool _doneStaticSymbol; int _useWstring; std::list<int> _useWstringHist; @@ -443,7 +439,7 @@ private: { public: - Cpp11ObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool); + Cpp11ObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); protected: @@ -455,7 +451,6 @@ private: ::IceUtilInternal::Output& C; std::string _dllExport; - bool _stream; bool _doneStaticSymbol; int _useWstring; std::list<int> _useWstringHist; @@ -465,7 +460,7 @@ private: { public: - Cpp11LocalObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool); + Cpp11LocalObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); virtual bool visitModuleStart(const ModulePtr&); virtual void visitModuleEnd(const ModulePtr&); @@ -480,7 +475,7 @@ private: { public: - Cpp11InterfaceVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool); + Cpp11InterfaceVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); virtual bool visitModuleStart(const ModulePtr&); virtual void visitModuleEnd(const ModulePtr&); @@ -496,7 +491,7 @@ private: { public: - Cpp11ValueVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool); + Cpp11ValueVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&); virtual bool visitModuleStart(const ModulePtr&); virtual void visitModuleEnd(const ModulePtr&); diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp index 013f3dbce16..41a84b83f2e 100644 --- a/cpp/src/slice2cpp/Main.cpp +++ b/cpp/src/slice2cpp/Main.cpp @@ -82,7 +82,6 @@ usage(const char* n) "--ice Allow reserved Ice prefix in Slice identifiers.\n" "--underscore Allow underscores in Slice identifiers.\n" "--checksum Generate checksums for Slice definitions.\n" - "--stream Generate marshaling support for public stream API.\n" ; } @@ -112,7 +111,6 @@ compile(int argc, char* argv[]) opts.addOpt("", "ice"); opts.addOpt("", "underscore"); opts.addOpt("", "checksum"); - opts.addOpt("", "stream"); bool validate = false; for(int i = 0; i < argc; ++i) @@ -202,8 +200,6 @@ compile(int argc, char* argv[]) bool checksum = opts.isSet("checksum"); - bool stream = opts.isSet("stream"); - if(args.empty()) { getErrorStream() << argv[0] << ": error: no input file" << endl; @@ -340,7 +336,7 @@ compile(int argc, char* argv[]) try { Gen gen(icecpp->getBaseName(), headerExtension, sourceExtension, extraHeaders, include, - includePaths, dllExport, output, implCpp98, implCpp11, checksum, stream, ice); + includePaths, dllExport, output, implCpp98, implCpp11, checksum, ice); gen.generate(u); } catch(const Slice::FileException& ex) diff --git a/cpp/test/Common/.depend.mak b/cpp/test/Common/.depend.mak index c071e31c3db..60c0f82777b 100644..100755 --- a/cpp/test/Common/.depend.mak +++ b/cpp/test/Common/.depend.mak @@ -19,7 +19,6 @@ Controller.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Controller.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Controller.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -103,7 +103,6 @@ TestCommon.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -149,11 +148,11 @@ TestCommon.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -167,12 +166,12 @@ TestCommon.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ diff --git a/cpp/test/Glacier2/attack/.depend.mak b/cpp/test/Glacier2/attack/.depend.mak index c857c9fd67b..37b98005da8 100755 --- a/cpp/test/Glacier2/attack/.depend.mak +++ b/cpp/test/Glacier2/attack/.depend.mak @@ -19,7 +19,6 @@ Backend.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Backend.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Backend.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ BackendI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ BackendI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ BackendI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ BackendI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ BackendI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -244,7 +242,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -274,12 +271,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -288,7 +285,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -300,6 +296,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -327,7 +324,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -381,7 +377,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -411,12 +406,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -425,7 +420,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -437,6 +431,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -464,7 +459,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Glacier2/dynamicFiltering/.depend.mak b/cpp/test/Glacier2/dynamicFiltering/.depend.mak index b2d37260dd7..22f5d24e995 100755 --- a/cpp/test/Glacier2/dynamicFiltering/.depend.mak +++ b/cpp/test/Glacier2/dynamicFiltering/.depend.mak @@ -23,7 +23,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -60,12 +59,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -80,6 +79,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -123,7 +123,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -153,12 +152,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -167,7 +166,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -179,6 +177,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -206,7 +205,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -260,7 +258,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -290,12 +287,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -304,7 +301,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -316,6 +312,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -343,7 +340,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -393,7 +389,6 @@ SessionI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -423,12 +418,12 @@ SessionI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -437,7 +432,6 @@ SessionI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -449,6 +443,7 @@ SessionI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -477,7 +472,6 @@ SessionI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -525,7 +519,6 @@ BackendI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -555,12 +548,12 @@ BackendI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -569,7 +562,6 @@ BackendI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -581,6 +573,7 @@ BackendI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -609,7 +602,6 @@ BackendI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -656,7 +648,6 @@ TestControllerI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -686,12 +677,12 @@ TestControllerI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -700,7 +691,6 @@ TestControllerI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -712,6 +702,7 @@ TestControllerI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -740,7 +731,6 @@ TestControllerI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Glacier2/override/.depend.mak b/cpp/test/Glacier2/override/.depend.mak index cc39fd19ff5..5ef7c6ef754 100755 --- a/cpp/test/Glacier2/override/.depend.mak +++ b/cpp/test/Glacier2/override/.depend.mak @@ -20,7 +20,6 @@ Callback.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -57,12 +56,12 @@ Callback.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -77,6 +76,7 @@ Callback.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -116,7 +116,6 @@ CallbackI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -146,12 +145,12 @@ CallbackI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -160,7 +159,6 @@ CallbackI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -172,6 +170,7 @@ CallbackI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -200,7 +199,6 @@ CallbackI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -260,7 +258,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -287,11 +284,11 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -300,7 +297,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -311,6 +307,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -337,7 +334,6 @@ Client.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -388,7 +384,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -418,12 +413,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -432,7 +427,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -444,6 +438,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -471,7 +466,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Glacier2/router/.depend.mak b/cpp/test/Glacier2/router/.depend.mak index 91ef269d1ec..6956e8a49c8 100755 --- a/cpp/test/Glacier2/router/.depend.mak +++ b/cpp/test/Glacier2/router/.depend.mak @@ -20,7 +20,6 @@ Callback.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -57,12 +56,12 @@ Callback.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -77,6 +76,7 @@ Callback.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -116,7 +116,6 @@ CallbackI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -146,12 +145,12 @@ CallbackI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -160,7 +159,6 @@ CallbackI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -172,6 +170,7 @@ CallbackI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -200,7 +199,6 @@ CallbackI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -261,7 +259,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -288,11 +285,11 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -301,7 +298,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -312,6 +308,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -338,7 +335,6 @@ Client.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -389,7 +385,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -419,12 +414,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -433,7 +428,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -445,6 +439,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -472,7 +467,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Glacier2/sessionControl/.depend.mak b/cpp/test/Glacier2/sessionControl/.depend.mak index 9445ac64b83..2f6a46c718b 100755 --- a/cpp/test/Glacier2/sessionControl/.depend.mak +++ b/cpp/test/Glacier2/sessionControl/.depend.mak @@ -23,7 +23,6 @@ Session.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -60,12 +59,12 @@ Session.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -80,6 +79,7 @@ Session.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -124,7 +124,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -154,12 +153,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -168,7 +167,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -180,6 +178,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -207,7 +206,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -261,7 +259,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -291,12 +288,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -305,7 +302,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -317,6 +313,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -344,7 +341,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -392,7 +388,6 @@ SessionI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -422,12 +417,12 @@ SessionI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -436,7 +431,6 @@ SessionI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -448,6 +442,7 @@ SessionI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -476,7 +471,6 @@ SessionI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Glacier2/sessionHelper/.depend.mak b/cpp/test/Glacier2/sessionHelper/.depend.mak index ddedb461b3d..ecb386bbb8f 100755 --- a/cpp/test/Glacier2/sessionHelper/.depend.mak +++ b/cpp/test/Glacier2/sessionHelper/.depend.mak @@ -19,7 +19,6 @@ Callback.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Callback.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Callback.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -124,7 +124,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -151,11 +150,11 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -164,7 +163,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -175,6 +173,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -202,7 +201,6 @@ Client.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -265,7 +263,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -292,11 +289,11 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -305,7 +302,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -316,6 +312,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -343,7 +340,6 @@ Server.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Glacier2/ssl/.depend.mak b/cpp/test/Glacier2/ssl/.depend.mak index 02f88a645b0..d83991a0cf6 100755 --- a/cpp/test/Glacier2/ssl/.depend.mak +++ b/cpp/test/Glacier2/ssl/.depend.mak @@ -29,7 +29,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -59,12 +58,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -73,7 +72,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -85,6 +83,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -112,7 +111,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -165,7 +163,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -195,12 +192,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -209,7 +206,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -221,6 +217,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -248,7 +245,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Glacier2/staticFiltering/.depend.mak b/cpp/test/Glacier2/staticFiltering/.depend.mak index 2873ab0fc56..b6c5315d58e 100755 --- a/cpp/test/Glacier2/staticFiltering/.depend.mak +++ b/cpp/test/Glacier2/staticFiltering/.depend.mak @@ -19,7 +19,6 @@ Backend.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Backend.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Backend.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ BackendI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ BackendI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ BackendI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ BackendI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ BackendI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -243,7 +241,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -273,12 +270,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -287,7 +284,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -299,6 +295,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -326,7 +323,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -380,7 +376,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -410,12 +405,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -424,7 +419,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -436,6 +430,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -463,7 +458,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/Makefile b/cpp/test/Ice/Makefile index b80f75ace0a..cec8e0380eb 100644 --- a/cpp/test/Ice/Makefile +++ b/cpp/test/Ice/Makefile @@ -54,7 +54,6 @@ ifneq ($(CPP11_MAPPING),yes) SUBDIRS := $(SUBDIRS) \ optional \ gc \ - stream \ custom \ echo endif diff --git a/cpp/test/Ice/Makefile.mak b/cpp/test/Ice/Makefile.mak index 42cb190dc10..06c947a2805 100644 --- a/cpp/test/Ice/Makefile.mak +++ b/cpp/test/Ice/Makefile.mak @@ -72,7 +72,6 @@ SUBDIRS = proxy \ udp \ admin \ plugin \ - stream \ metrics \ optional \ enums \ diff --git a/cpp/test/Ice/acm/.depend.mak b/cpp/test/Ice/acm/.depend.mak index df7995c22fb..e58a8614428 100755 --- a/cpp/test/Ice/acm/.depend.mak +++ b/cpp/test/Ice/acm/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -388,7 +384,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -415,11 +410,11 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -428,7 +423,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -439,6 +433,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -466,7 +461,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -510,7 +504,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -540,12 +533,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -554,7 +547,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -566,6 +558,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -594,7 +587,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/adapterDeactivation/.depend.mak b/cpp/test/Ice/adapterDeactivation/.depend.mak index 17dd82578d1..1f37d42858e 100755 --- a/cpp/test/Ice/adapterDeactivation/.depend.mak +++ b/cpp/test/Ice/adapterDeactivation/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -115,7 +115,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -145,12 +144,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -159,7 +158,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -171,6 +169,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -388,7 +384,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -415,11 +410,11 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -428,7 +423,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -439,6 +433,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -466,7 +461,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -511,7 +505,6 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -541,12 +534,12 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -555,7 +548,6 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -567,6 +559,7 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -595,7 +588,6 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -645,7 +637,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -675,12 +666,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -689,7 +680,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -701,6 +691,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -728,7 +719,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -777,7 +767,6 @@ Collocated.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -807,12 +796,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -821,7 +810,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -833,6 +821,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -860,7 +849,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/admin/.depend.mak b/cpp/test/Ice/admin/.depend.mak index 6056e53e85f..0aeb962c4f3 100755 --- a/cpp/test/Ice/admin/.depend.mak +++ b/cpp/test/Ice/admin/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -120,7 +120,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -150,12 +149,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -164,7 +163,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -176,6 +174,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -204,7 +203,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -252,7 +250,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -282,12 +279,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -296,7 +293,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -308,6 +304,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -336,7 +333,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -374,7 +370,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -411,12 +406,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -431,6 +426,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -450,7 +446,6 @@ TestI.obj: \ "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -477,7 +472,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -518,7 +512,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -548,12 +541,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -562,7 +555,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -574,6 +566,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -602,7 +595,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/ami/.depend.mak b/cpp/test/Ice/ami/.depend.mak index d848f6acf2b..146f63442ef 100755 --- a/cpp/test/Ice/ami/.depend.mak +++ b/cpp/test/Ice/ami/.depend.mak @@ -23,7 +23,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -60,12 +59,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -80,6 +79,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -119,7 +119,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -149,12 +148,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -163,7 +162,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -175,6 +173,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -203,7 +202,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -251,7 +249,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -281,12 +278,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -295,7 +292,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -307,6 +303,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -335,7 +332,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -373,7 +369,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -410,12 +405,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -430,6 +425,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -446,7 +442,6 @@ TestI.obj: \ "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -517,7 +511,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -547,12 +540,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -561,7 +554,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -573,6 +565,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -601,7 +594,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -650,7 +642,6 @@ Collocated.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -680,12 +671,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -694,7 +685,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -706,6 +696,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -734,7 +725,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/background/.depend.mak b/cpp/test/Ice/background/.depend.mak index cb04600024c..40cd47b1196 100755 --- a/cpp/test/Ice/background/.depend.mak +++ b/cpp/test/Ice/background/.depend.mak @@ -23,7 +23,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -60,12 +59,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -80,6 +79,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -127,7 +127,6 @@ Configuration.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -161,18 +160,17 @@ Configuration.obj: \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "..\..\..\src\Ice\EventHandlerF.h" \ @@ -217,7 +215,6 @@ Connector.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -251,18 +248,17 @@ Connector.obj: \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "..\..\..\src\Ice\EventHandlerF.h" \ "Transceiver.h" \ @@ -278,6 +274,7 @@ Connector.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -307,7 +304,6 @@ Acceptor.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -344,12 +340,12 @@ Acceptor.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -358,7 +354,6 @@ Acceptor.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "EndpointI.h" \ "..\..\..\src\Ice\EndpointI.h" \ @@ -371,6 +366,7 @@ Acceptor.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -408,7 +404,6 @@ EndpointI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -451,12 +446,12 @@ EndpointI.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -469,6 +464,7 @@ EndpointI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -486,7 +482,6 @@ EndpointI.obj: \ "..\..\..\src\Ice\NetworkF.h" \ "..\..\..\src\Ice\NetworkProxyF.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "..\..\..\src\Ice\EventHandlerF.h" \ "Transceiver.h" \ @@ -516,7 +511,6 @@ Transceiver.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -557,12 +551,12 @@ Transceiver.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -571,7 +565,6 @@ Transceiver.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "Configuration.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -616,7 +609,6 @@ EndpointFactory.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -657,12 +649,11 @@ EndpointFactory.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -675,6 +666,7 @@ EndpointFactory.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -721,7 +713,6 @@ PluginI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -751,12 +742,12 @@ PluginI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -765,7 +756,6 @@ PluginI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -823,7 +813,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -853,12 +842,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -867,7 +856,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -879,6 +867,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -907,7 +896,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -974,7 +962,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1001,11 +988,11 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1014,7 +1001,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1025,6 +1011,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1052,7 +1039,6 @@ AllTests.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1094,7 +1080,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1131,12 +1116,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1151,6 +1136,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -1170,7 +1156,6 @@ TestI.obj: \ "..\..\..\src\Ice\NetworkF.h" \ "..\..\..\src\Ice\NetworkProxyF.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "..\..\..\src\Ice\EventHandlerF.h" \ "$(includedir)\Ice\Ice.h" \ @@ -1204,7 +1189,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1246,7 +1230,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1276,12 +1259,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1290,7 +1273,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1302,6 +1284,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1330,7 +1313,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/background/EndpointFactory.cpp b/cpp/test/Ice/background/EndpointFactory.cpp index 1fbe25930de..a13efc6743b 100644 --- a/cpp/test/Ice/background/EndpointFactory.cpp +++ b/cpp/test/Ice/background/EndpointFactory.cpp @@ -38,15 +38,15 @@ EndpointFactory::create(vector<string>& args, bool oaEndpoint) const } IceInternal::EndpointIPtr -EndpointFactory::read(IceInternal::BasicStream* s) const +EndpointFactory::read(Ice::InputStream* s) const { short type; s->read(type); assert(type == _factory->type()); - s->startReadEncaps(); + s->startEncapsulation(); IceInternal::EndpointIPtr endpoint = ICE_MAKE_SHARED(EndpointI, _factory->read(s)); - s->endReadEncaps(); + s->endEncapsulation(); return endpoint; } diff --git a/cpp/test/Ice/background/EndpointFactory.h b/cpp/test/Ice/background/EndpointFactory.h index 90c9b6f2d80..873755ffefa 100644 --- a/cpp/test/Ice/background/EndpointFactory.h +++ b/cpp/test/Ice/background/EndpointFactory.h @@ -21,7 +21,7 @@ public: virtual ::Ice::Short type() const; virtual ::std::string protocol() const; virtual IceInternal::EndpointIPtr create(std::vector<std::string>&, bool) const; - virtual IceInternal::EndpointIPtr read(IceInternal::BasicStream*) const; + virtual IceInternal::EndpointIPtr read(Ice::InputStream*) const; virtual void destroy(); virtual IceInternal::EndpointFactoryPtr clone(const IceInternal::ProtocolInstancePtr&) const; diff --git a/cpp/test/Ice/background/EndpointI.cpp b/cpp/test/Ice/background/EndpointI.cpp index d8051177e1a..cc71d5bb97b 100644 --- a/cpp/test/Ice/background/EndpointI.cpp +++ b/cpp/test/Ice/background/EndpointI.cpp @@ -11,7 +11,6 @@ #include <Transceiver.h> #include <Connector.h> #include <Acceptor.h> -#include <Ice/BasicStream.h> #ifdef _MSC_VER // For 'Ice::Object::ice_getHash': was declared deprecated @@ -33,12 +32,12 @@ EndpointI::EndpointI(const IceInternal::EndpointIPtr& endpoint) : } void -EndpointI::streamWrite(IceInternal::BasicStream* s) const +EndpointI::streamWrite(Ice::OutputStream* s) const { - s->startWriteEncaps(); + s->startEncapsulation(); s->write(_endpoint->type()); _endpoint->streamWrite(s); - s->endWriteEncaps(); + s->endEncapsulation(); } Ice::Short diff --git a/cpp/test/Ice/background/EndpointI.h b/cpp/test/Ice/background/EndpointI.h index 9e2d1d2a7a8..b948d06368b 100644 --- a/cpp/test/Ice/background/EndpointI.h +++ b/cpp/test/Ice/background/EndpointI.h @@ -27,7 +27,7 @@ public: EndpointI(const IceInternal::EndpointIPtr&); // From EndpointI - virtual void streamWrite(IceInternal::BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; virtual Ice::Short type() const; virtual const std::string& protocol() const; virtual IceInternal::EndpointIPtr timeout(Ice::Int) const; diff --git a/cpp/test/Ice/binding/.depend.mak b/cpp/test/Ice/binding/.depend.mak index 8295c5d6785..b0dc04a6e18 100755 --- a/cpp/test/Ice/binding/.depend.mak +++ b/cpp/test/Ice/binding/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -247,7 +245,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -277,12 +274,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -291,7 +288,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -303,6 +299,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -331,7 +328,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -379,7 +375,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -409,12 +404,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -423,7 +418,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -435,6 +429,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -463,7 +458,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -507,7 +501,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -537,12 +530,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -551,7 +544,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -563,6 +555,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -591,7 +584,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/checksum/.depend.mak b/cpp/test/Ice/checksum/.depend.mak index 763a21b1156..8185ccdca69 100755 --- a/cpp/test/Ice/checksum/.depend.mak +++ b/cpp/test/Ice/checksum/.depend.mak @@ -23,7 +23,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -60,12 +59,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -80,6 +79,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -108,7 +108,6 @@ Types.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -145,12 +144,12 @@ Types.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -165,6 +164,7 @@ Types.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -205,7 +205,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -235,12 +234,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -249,7 +248,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -261,6 +259,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -289,7 +288,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -337,7 +335,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -367,12 +364,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -381,7 +378,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -393,6 +389,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -421,7 +418,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/checksum/server/.depend.mak b/cpp/test/Ice/checksum/server/.depend.mak index 4ee3971c442..50507d768a3 100755 --- a/cpp/test/Ice/checksum/server/.depend.mak +++ b/cpp/test/Ice/checksum/server/.depend.mak @@ -23,7 +23,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -60,12 +59,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -80,6 +79,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -108,7 +108,6 @@ Types.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -145,12 +144,12 @@ Types.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -165,6 +164,7 @@ Types.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -205,7 +205,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -235,12 +234,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -249,7 +248,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -261,6 +259,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -289,7 +288,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -333,7 +331,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -363,12 +360,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -377,7 +374,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -389,6 +385,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -417,7 +414,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/custom/.depend.mak b/cpp/test/Ice/custom/.depend.mak index f3b7ecf6e16..2b1c5b351d0 100755 --- a/cpp/test/Ice/custom/.depend.mak +++ b/cpp/test/Ice/custom/.depend.mak @@ -28,7 +28,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -65,12 +64,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -85,6 +84,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -98,7 +98,6 @@ Test.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -129,7 +128,6 @@ Test.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -160,7 +158,6 @@ Wstring.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -197,12 +194,12 @@ Wstring.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -217,6 +214,7 @@ Wstring.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -255,7 +253,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -285,12 +282,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -299,7 +296,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -311,6 +307,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -339,7 +336,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -392,7 +388,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -422,12 +417,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -436,7 +431,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -448,6 +442,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -476,7 +471,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -533,7 +527,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -570,12 +563,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -590,11 +583,11 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -635,7 +628,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -666,7 +658,6 @@ WstringI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -703,12 +694,12 @@ WstringI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -723,6 +714,7 @@ WstringI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -756,7 +748,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -786,12 +777,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -800,7 +791,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -812,6 +802,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -840,7 +831,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -884,7 +874,6 @@ TestAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -921,12 +910,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -941,6 +930,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -955,7 +945,6 @@ TestAMD.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -985,7 +974,6 @@ TestAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1016,7 +1004,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1053,12 +1040,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1073,11 +1060,11 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ @@ -1118,7 +1105,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1148,7 +1134,6 @@ WstringAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1185,12 +1170,12 @@ WstringAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1205,6 +1190,7 @@ WstringAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1233,7 +1219,6 @@ WstringAMDI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1270,12 +1255,12 @@ WstringAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1290,6 +1275,7 @@ WstringAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1324,7 +1310,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1354,12 +1339,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1368,7 +1353,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1380,6 +1364,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1408,7 +1393,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1464,7 +1448,6 @@ Collocated.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1494,12 +1477,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1508,7 +1491,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1520,6 +1502,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1548,7 +1531,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp index 42937e63c50..ec0d7c67d4b 100644 --- a/cpp/test/Ice/custom/AllTests.cpp +++ b/cpp/test/Ice/custom/AllTests.cpp @@ -1186,14 +1186,14 @@ allTests(const Ice::CommunicatorPtr& communicator) Test::BufferStruct rs = t->opBufferStruct(bs); test(rs == bs); - Ice::OutputStreamPtr os = Ice::createOutputStream(communicator); - os->write(rs); + Ice::OutputStream os(communicator); + os.write(rs); Ice::ByteSeq bytes; - os->finished(bytes); + os.finished(bytes); - Ice::InputStreamPtr is = Ice::wrapInputStream(communicator, bytes); + Ice::InputStream is(communicator, os.getEncoding(), bytes); Test::BufferStruct rs2; - is->read(rs2); + is.read(rs2); test(rs == rs2); } cout << "ok" << endl; diff --git a/cpp/test/Ice/defaultServant/.depend.mak b/cpp/test/Ice/defaultServant/.depend.mak index 97e58f34056..c14c628beea 100755 --- a/cpp/test/Ice/defaultServant/.depend.mak +++ b/cpp/test/Ice/defaultServant/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -242,7 +240,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -272,12 +269,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -286,7 +283,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -298,6 +294,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -326,7 +323,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -374,7 +370,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -404,12 +399,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -418,7 +413,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -430,6 +424,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -458,7 +453,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/defaultValue/.depend.mak b/cpp/test/Ice/defaultValue/.depend.mak index 7f1c0eb2758..3c0367e6747 100755 --- a/cpp/test/Ice/defaultValue/.depend.mak +++ b/cpp/test/Ice/defaultValue/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/dispatcher/.depend.mak b/cpp/test/Ice/dispatcher/.depend.mak index 3a33b46d8ea..a1b9251d447 100755 --- a/cpp/test/Ice/dispatcher/.depend.mak +++ b/cpp/test/Ice/dispatcher/.depend.mak @@ -23,7 +23,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -60,12 +59,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -80,6 +79,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -119,7 +119,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -149,12 +148,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -163,7 +162,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -175,6 +173,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -203,7 +202,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -252,7 +250,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -282,12 +279,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -296,7 +293,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -308,6 +304,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -336,7 +333,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -384,7 +380,6 @@ Dispatcher.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -424,7 +419,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -461,12 +455,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -481,6 +475,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -491,7 +486,6 @@ TestI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -521,7 +515,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -569,7 +562,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -599,12 +591,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -613,7 +605,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -625,6 +616,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -653,7 +645,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -703,7 +694,6 @@ Collocated.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -733,12 +723,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -747,7 +737,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -759,6 +748,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -787,7 +777,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/echo/.depend.mak b/cpp/test/Ice/echo/.depend.mak index cca22a41b30..c84234dba0d 100755 --- a/cpp/test/Ice/echo/.depend.mak +++ b/cpp/test/Ice/echo/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ BlobjectI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ BlobjectI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ BlobjectI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ BlobjectI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ BlobjectI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -241,7 +239,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -271,12 +268,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -285,7 +282,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -297,6 +293,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -325,7 +322,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/enums/.depend.mak b/cpp/test/Ice/enums/.depend.mak index 6fc307b3376..5b60af13ab8 100755 --- a/cpp/test/Ice/enums/.depend.mak +++ b/cpp/test/Ice/enums/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -408,12 +403,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -511,7 +505,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -541,12 +534,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -555,7 +548,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -567,6 +559,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -595,7 +588,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/enums/AllTests.cpp b/cpp/test/Ice/enums/AllTests.cpp index 9178e812945..825bd1e78d1 100644 --- a/cpp/test/Ice/enums/AllTests.cpp +++ b/cpp/test/Ice/enums/AllTests.cpp @@ -8,7 +8,6 @@ // ********************************************************************** #include <Ice/Ice.h> -#include <Ice/Stream.h> #include <TestCommon.h> #include <Test.h> @@ -72,30 +71,37 @@ allTests(const Ice::CommunicatorPtr& communicator) #ifndef ICE_CPP11_MAPPING cout << "testing enum streaming... " << flush; - Ice::OutputStreamPtr out; Ice::ByteSeq bytes; const bool encoding_1_0 = communicator->getProperties()->getProperty("Ice.Default.EncodingVersion") == "1.0"; - out = Ice::createOutputStream(communicator); - out->write(ICE_ENUM(ByteEnum, benum11)); - out->finished(bytes); - test(bytes.size() == 1); // ByteEnum should require one byte - - out = Ice::createOutputStream(communicator); - out->write(ICE_ENUM(ShortEnum, senum11)); - out->finished(bytes); - test(bytes.size() == (encoding_1_0 ? 2 : 5)); - - out = Ice::createOutputStream(communicator); - out->write(ICE_ENUM(IntEnum, ienum11)); - out->finished(bytes); - test(bytes.size() == (encoding_1_0 ? 4 : 5)); - - out = Ice::createOutputStream(communicator); - out->write(ICE_ENUM(SimpleEnum, blue)); - out->finished(bytes); - test(bytes.size() == 1); // SimpleEnum should require one byte + { + Ice::OutputStream out(communicator); + out.write(ICE_ENUM(ByteEnum, benum11)); + out.finished(bytes); + test(bytes.size() == 1); // ByteEnum should require one byte + } + + { + Ice::OutputStream out(communicator); + out.write(ICE_ENUM(ShortEnum, senum11)); + out.finished(bytes); + test(bytes.size() == (encoding_1_0 ? 2 : 5)); + } + + { + Ice::OutputStream out(communicator); + out.write(ICE_ENUM(IntEnum, ienum11)); + out.finished(bytes); + test(bytes.size() == (encoding_1_0 ? 4 : 5)); + } + + { + Ice::OutputStream out(communicator); + out.write(ICE_ENUM(SimpleEnum, blue)); + out.finished(bytes); + test(bytes.size() == 1); // SimpleEnum should require one byte + } cout << "ok" << endl; #endif diff --git a/cpp/test/Ice/exceptions/.depend.mak b/cpp/test/Ice/exceptions/.depend.mak index 83f4ae4d55b..457776017ab 100755 --- a/cpp/test/Ice/exceptions/.depend.mak +++ b/cpp/test/Ice/exceptions/.depend.mak @@ -24,7 +24,6 @@ ExceptionsI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -61,12 +60,12 @@ ExceptionsI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -81,6 +80,7 @@ ExceptionsI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -102,7 +102,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -139,12 +138,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -159,6 +158,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -197,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -227,12 +226,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -241,7 +240,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -253,6 +251,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -281,7 +280,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -339,7 +337,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -366,11 +363,11 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -379,7 +376,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -390,6 +386,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -417,7 +414,6 @@ AllTests.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -461,7 +457,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -491,12 +486,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -505,7 +500,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -517,6 +511,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -545,7 +540,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -594,7 +588,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -624,12 +617,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -638,7 +631,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -650,6 +642,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -678,7 +671,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -715,7 +707,6 @@ TestAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -752,12 +743,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -772,6 +763,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -811,7 +803,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -841,12 +832,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -855,7 +846,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -867,6 +857,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -895,7 +886,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -944,7 +934,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -974,12 +963,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -988,7 +977,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1000,6 +988,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1028,7 +1017,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1077,7 +1065,6 @@ Collocated.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1107,12 +1094,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1121,7 +1108,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1133,6 +1119,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1161,7 +1148,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index e5e2fa8c37b..fe2b782338b 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -646,7 +646,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing value factory registration exception... " << flush; { #ifdef ICE_CPP11_MAPPING - communicator->addValueFactory( + communicator->getValueFactoryManager()->add( [](const std::string&) { return nullptr; @@ -654,7 +654,7 @@ allTests(const Ice::CommunicatorPtr& communicator) "x"); try { - communicator->addValueFactory( + communicator->getValueFactoryManager()->add( [](const std::string&) { return nullptr; @@ -667,10 +667,10 @@ allTests(const Ice::CommunicatorPtr& communicator) } #else Ice::ValueFactoryPtr vf = new ValueFactoryI; - communicator->addValueFactory(vf, "x"); + communicator->getValueFactoryManager()->add(vf, "x"); try { - communicator->addValueFactory(vf, "x"); + communicator->getValueFactoryManager()->add(vf, "x"); test(false); } catch(const Ice::AlreadyRegisteredException&) diff --git a/cpp/test/Ice/facets/.depend.mak b/cpp/test/Ice/facets/.depend.mak index d9f7502de2f..85b6bd616aa 100755 --- a/cpp/test/Ice/facets/.depend.mak +++ b/cpp/test/Ice/facets/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -408,12 +403,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -506,7 +500,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -536,12 +529,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -550,7 +543,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -562,6 +554,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -590,7 +583,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -639,7 +631,6 @@ Collocated.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -669,12 +660,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -683,7 +674,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -695,6 +685,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -723,7 +714,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/faultTolerance/.depend.mak b/cpp/test/Ice/faultTolerance/.depend.mak index c1beda1f79f..05607575bd7 100755 --- a/cpp/test/Ice/faultTolerance/.depend.mak +++ b/cpp/test/Ice/faultTolerance/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -408,12 +403,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -506,7 +500,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -536,12 +529,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -550,7 +543,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -562,6 +554,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -590,7 +583,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/gc/.depend.mak b/cpp/test/Ice/gc/.depend.mak index 330709c843b..3fd8f29095c 100755 --- a/cpp/test/Ice/gc/.depend.mak +++ b/cpp/test/Ice/gc/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -116,7 +116,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -146,12 +145,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -160,7 +159,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -171,6 +169,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -199,7 +198,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/hash/.depend.mak b/cpp/test/Ice/hash/.depend.mak index 3af028174af..e80313ae9f8 100755 --- a/cpp/test/Ice/hash/.depend.mak +++ b/cpp/test/Ice/hash/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/hold/.depend.mak b/cpp/test/Ice/hold/.depend.mak index 2626409dbdb..f36afe8e002 100755 --- a/cpp/test/Ice/hold/.depend.mak +++ b/cpp/test/Ice/hold/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -379,7 +375,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -409,12 +404,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -423,7 +418,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -435,6 +429,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -463,7 +458,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -512,7 +506,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -542,12 +535,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -556,7 +549,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -568,6 +560,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -596,7 +589,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/impl/.depend.mak b/cpp/test/Ice/impl/.depend.mak index d8d5845743f..9a1883cf786 100644..100755 --- a/cpp/test/Ice/impl/.depend.mak +++ b/cpp/test/Ice/impl/.depend.mak @@ -32,7 +32,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -69,12 +68,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -89,6 +88,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -116,7 +116,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -153,12 +152,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -173,6 +172,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -206,7 +206,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -236,12 +235,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -250,7 +249,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -262,6 +260,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -290,7 +289,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -327,7 +325,6 @@ TestAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -364,12 +361,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -384,6 +381,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -412,7 +410,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -449,12 +446,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -469,6 +466,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -503,7 +501,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -533,12 +530,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -547,7 +544,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -559,6 +555,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -587,7 +584,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/info/.depend.mak b/cpp/test/Ice/info/.depend.mak index 6334ec0e151..04545c80f45 100755 --- a/cpp/test/Ice/info/.depend.mak +++ b/cpp/test/Ice/info/.depend.mak @@ -24,7 +24,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -61,12 +60,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -81,6 +80,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -119,7 +119,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -149,12 +148,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -163,7 +162,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -175,6 +173,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -203,7 +202,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -257,7 +255,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -287,12 +284,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -301,7 +298,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -313,6 +309,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -341,7 +338,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -389,7 +385,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -419,12 +414,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -433,7 +428,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -445,6 +439,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -473,7 +468,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -527,7 +521,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -557,12 +550,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -571,7 +564,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -583,6 +575,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -611,7 +604,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/inheritance/.depend.mak b/cpp/test/Ice/inheritance/.depend.mak index f19cbac48cb..6d763dda836 100755 --- a/cpp/test/Ice/inheritance/.depend.mak +++ b/cpp/test/Ice/inheritance/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -408,12 +403,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -511,7 +505,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -541,12 +534,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -555,7 +548,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -567,6 +559,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -595,7 +588,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -644,7 +636,6 @@ Collocated.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -674,12 +665,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -688,7 +679,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -700,6 +690,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -728,7 +719,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/interceptor/.depend.mak b/cpp/test/Ice/interceptor/.depend.mak index c6ecc7971bf..8adb086f98c 100755 --- a/cpp/test/Ice/interceptor/.depend.mak +++ b/cpp/test/Ice/interceptor/.depend.mak @@ -31,7 +31,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -61,12 +60,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -75,7 +74,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -87,6 +85,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -115,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -167,7 +165,6 @@ InterceptorI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -197,12 +194,12 @@ InterceptorI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -211,7 +208,6 @@ InterceptorI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -223,6 +219,7 @@ InterceptorI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -251,7 +248,6 @@ InterceptorI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -302,7 +298,6 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -332,12 +327,12 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -346,7 +341,6 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -358,6 +352,7 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -386,7 +381,6 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -434,7 +428,6 @@ MyObjectI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -464,12 +457,12 @@ MyObjectI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -478,7 +471,6 @@ MyObjectI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -490,6 +482,7 @@ MyObjectI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -518,7 +511,6 @@ MyObjectI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -555,7 +547,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -592,12 +583,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -612,6 +603,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -651,7 +643,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -681,12 +672,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -695,7 +686,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -707,6 +697,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -735,7 +726,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/invoke/.depend.mak b/cpp/test/Ice/invoke/.depend.mak index bd6dabe4dcb..a80c9c52947 100755 --- a/cpp/test/Ice/invoke/.depend.mak +++ b/cpp/test/Ice/invoke/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ BlobjectI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -408,12 +403,12 @@ BlobjectI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ BlobjectI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ BlobjectI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ BlobjectI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -511,7 +505,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -541,12 +534,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -555,7 +548,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -567,6 +559,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -595,7 +588,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/invoke/AllTests.cpp b/cpp/test/Ice/invoke/AllTests.cpp index b0b12c060c6..54a57c377d7 100644 --- a/cpp/test/Ice/invoke/AllTests.cpp +++ b/cpp/test/Ice/invoke/AllTests.cpp @@ -8,7 +8,6 @@ // ********************************************************************** #include <Ice/Ice.h> -#include <Ice/Stream.h> #include <TestCommon.h> #include <Test.h> @@ -89,20 +88,20 @@ public: Ice::ByteSeq outParams; if(result->getProxy()->end_ice_invoke(outParams, result)) { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, result->getProxy()->ice_getEncodingVersion(), outParams); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == cmp); - in->read(s); + in.read(s); test(s == cmp); - in->endEncapsulation(); + in.endEncapsulation(); called(); } else { test(false); - }; + } } void opException(const Ice::AsyncResultPtr& result) @@ -120,15 +119,15 @@ public: } else { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, result->getProxy()->ice_getEncodingVersion(), outParams); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); } catch(const Test::MyException&) { - in->endEncapsulation(); + in.endEncapsulation(); called(); } catch(...) @@ -142,14 +141,14 @@ public: { if(ok) { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, outParams); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); called(); } else @@ -162,14 +161,14 @@ public: { if(ok) { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, outParams); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); called(); } else @@ -182,14 +181,14 @@ public: { if(ok) { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, outParams); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == cookie->getString()); - in->read(s); + in.read(s); test(s == cookie->getString()); - in->endEncapsulation(); + in.endEncapsulation(); called(); } else @@ -206,15 +205,15 @@ public: } else { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, outParams); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); } catch(const Test::MyException&) { - in->endEncapsulation(); + in.endEncapsulation(); called(); } catch(...) @@ -232,15 +231,15 @@ public: } else { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, outParams); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); } catch(const Test::MyException&) { - in->endEncapsulation(); + in.endEncapsulation(); called(); } catch(...) @@ -259,15 +258,15 @@ public: } else { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, outParams); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); } catch(const Test::MyException&) { - in->endEncapsulation(); + in.endEncapsulation(); called(); } catch(...) @@ -313,23 +312,23 @@ allTests(const Ice::CommunicatorPtr& communicator) test(batchOneway->ice_invoke("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps)); batchOneway->ice_flushBatchRequests(); - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(testString); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(testString); + out.endEncapsulation(); + out.finished(inEncaps); // ice_invoke if(cl->ice_invoke("opString", ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps)) { - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } else { @@ -340,14 +339,14 @@ allTests(const Ice::CommunicatorPtr& communicator) pair<const ::Ice::Byte*, const ::Ice::Byte*> inPair(&inEncaps[0], &inEncaps[0] + inEncaps.size()); if(cl->ice_invoke("opString", ICE_ENUM(OperationMode, Normal), inPair, outEncaps)) { - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } else { @@ -363,11 +362,11 @@ allTests(const Ice::CommunicatorPtr& communicator) } else { - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, cl->ice_getEncodingVersion(), outEncaps); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); } catch(const Test::MyException&) { @@ -376,7 +375,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { test(false); } - in->endEncapsulation(); + in.endEncapsulation(); } } @@ -451,11 +450,11 @@ allTests(const Ice::CommunicatorPtr& communicator) { promise<bool> completed; Ice::ByteSeq inEncaps, outEncaps; - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(testString); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(testString); + out.endEncapsulation(); + out.finished(inEncaps); cl->ice_invoke_async("opString", OperationMode::Normal, inEncaps, [&](bool ok, vector<Ice::Byte> outParams) @@ -469,37 +468,37 @@ allTests(const Ice::CommunicatorPtr& communicator) }); test(completed.get_future().get()); - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, outEncaps); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } // // repeat with the future API. // { Ice::ByteSeq inEncaps, outEncaps; - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(testString); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(testString); + out.endEncapsulation(); + out.finished(inEncaps); auto result = cl->ice_invoke_async("opString", OperationMode::Normal, inEncaps).get(); test(result.ok); - Ice::InputStreamPtr in = Ice::createInputStream(communicator, result.outParams); - in->startEncapsulation(); + Ice::InputStream in(communicator, result.outParams); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } @@ -507,11 +506,11 @@ allTests(const Ice::CommunicatorPtr& communicator) promise<bool> completed; promise<void> sent; Ice::ByteSeq inEncaps, outEncaps; - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(testString); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(testString); + out.endEncapsulation(); + out.finished(inEncaps); pair<const ::Ice::Byte*, const ::Ice::Byte*> inPair(&inEncaps[0], &inEncaps[0] + inEncaps.size()); @@ -532,39 +531,39 @@ allTests(const Ice::CommunicatorPtr& communicator) sent.get_future().get(); // Ensure sent callback was called test(completed.get_future().get()); - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, outEncaps); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } // // repeat with the future API. // { Ice::ByteSeq inEncaps, outEncaps; - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(testString); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(testString); + out.endEncapsulation(); + out.finished(inEncaps); pair<const ::Ice::Byte*, const ::Ice::Byte*> inPair(&inEncaps[0], &inEncaps[0] + inEncaps.size()); auto result = cl->ice_invoke_async("opString", OperationMode::Normal, inPair).get(); test(result.ok); vector<Ice::Byte>(result.outParams.first, result.outParams.second).swap(outEncaps); - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, outEncaps); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } { @@ -589,11 +588,11 @@ allTests(const Ice::CommunicatorPtr& communicator) sent.get_future().get(); // Ensure sent callback was called test(!completed.get_future().get()); - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, outEncaps); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); test(false); } catch(const Test::MyException&) @@ -612,11 +611,11 @@ allTests(const Ice::CommunicatorPtr& communicator) auto result = cl->ice_invoke_async("opException", OperationMode::Normal, inEncaps).get(); test(!result.ok); - Ice::InputStreamPtr in = Ice::createInputStream(communicator, result.outParams); - in->startEncapsulation(); + Ice::InputStream in(communicator, result.outParams); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); test(false); } catch(const Test::MyException&) @@ -650,49 +649,49 @@ allTests(const Ice::CommunicatorPtr& communicator) { test(false); } - - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(testString); - out->endEncapsulation(); - out->finished(inEncaps); + + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(testString); + out.endEncapsulation(); + out.finished(inEncaps); // begin_ice_invoke with no callback result = cl->begin_ice_invoke("opString", Ice::Normal, inEncaps); if(cl->end_ice_invoke(outEncaps, result)) { - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } else { test(false); - }; + } // begin_ice_invoke with no callback and array mapping pair<const ::Ice::Byte*, const ::Ice::Byte*> inPair(&inEncaps[0], &inEncaps[0] + inEncaps.size()); result = cl->begin_ice_invoke("opString", Ice::Normal, inPair); if(cl->end_ice_invoke(outEncaps, result)) { - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } else { test(false); - }; + } // begin_ice_invoke with Callback ::CallbackPtr cb = new ::Callback(communicator, false); @@ -741,11 +740,11 @@ allTests(const Ice::CommunicatorPtr& communicator) } else { - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, cl->ice_getEncodingVersion(), outEncaps); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); } catch(const Test::MyException&) { @@ -754,7 +753,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { test(false); } - in->endEncapsulation(); + in.endEncapsulation(); } // begin_ice_invoke with Callback diff --git a/cpp/test/Ice/invoke/BlobjectI.cpp b/cpp/test/Ice/invoke/BlobjectI.cpp index 6ec24555023..45afab5d21e 100644 --- a/cpp/test/Ice/invoke/BlobjectI.cpp +++ b/cpp/test/Ice/invoke/BlobjectI.cpp @@ -15,11 +15,11 @@ using namespace std; bool -invokeInternal(const Ice::InputStreamPtr& in, vector<Ice::Byte>& outEncaps, const Ice::Current& current) +invokeInternal(Ice::InputStream& in, vector<Ice::Byte>& outEncaps, const Ice::Current& current) { Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); + Ice::OutputStream out(communicator); + out.startEncapsulation(); if(current.operation == "opOneway") { return true; @@ -27,46 +27,46 @@ invokeInternal(const Ice::InputStreamPtr& in, vector<Ice::Byte>& outEncaps, cons else if(current.operation == "opString") { string s; - in->startEncapsulation(); - in->read(s); - in->endEncapsulation(); - out->write(s); - out->write(s); - out->endEncapsulation(); - out->finished(outEncaps); + in.startEncapsulation(); + in.read(s); + in.endEncapsulation(); + out.write(s); + out.write(s); + out.endEncapsulation(); + out.finished(outEncaps); return true; } else if(current.operation == "opException") { Test::MyException ex; - out->writeException(ex); - out->endEncapsulation(); - out->finished(outEncaps); + out.writeException(ex); + out.endEncapsulation(); + out.finished(outEncaps); return false; } else if(current.operation == "shutdown") { - out->endEncapsulation(); - out->finished(outEncaps); + out.endEncapsulation(); + out.finished(outEncaps); communicator->shutdown(); return true; } else if(current.operation == "ice_isA") { string s; - in->startEncapsulation(); - in->read(s); - in->endEncapsulation(); + in.startEncapsulation(); + in.read(s); + in.endEncapsulation(); if(s == "::Test::MyClass") { - out->write(true); + out.write(true); } else { - out->write(false); + out.write(false); } - out->endEncapsulation(); - out->finished(outEncaps); + out.endEncapsulation(); + out.finished(outEncaps); return true; } else @@ -82,7 +82,7 @@ invokeInternal(const Ice::InputStreamPtr& in, vector<Ice::Byte>& outEncaps, cons bool BlobjectI::ice_invoke(const vector<Ice::Byte>& inEncaps, vector<Ice::Byte>& outEncaps, const Ice::Current& current) { - Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps); + Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps); return invokeInternal(in, outEncaps, current); } @@ -90,7 +90,7 @@ bool BlobjectArrayI::ice_invoke(const pair<const Ice::Byte*, const Ice::Byte*>& inEncaps, vector<Ice::Byte>& outEncaps, const Ice::Current& current) { - Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps); + Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps); return invokeInternal(in, outEncaps, current); } @@ -101,7 +101,7 @@ BlobjectAsyncI::ice_invoke_async(vector<Ice::Byte> inEncaps, function<void (exception_ptr)>, const Ice::Current& current) { - Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps); + Ice::InputStream in(current.adapter->getCommunicator(), inEncaps); vector<Ice::Byte> outEncaps; bool ok = invokeInternal(in, outEncaps, current); response(ok, move(outEncaps)); @@ -113,7 +113,7 @@ BlobjectArrayAsyncI::ice_invoke_async(pair<const Ice::Byte*, const Ice::Byte*> i function<void (exception_ptr)>, const Ice::Current& current) { - Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps); + Ice::InputStream in(current.adapter->getCommunicator(), inEncaps); vector<Ice::Byte> outEncaps; bool ok = invokeInternal(in, outEncaps, current); #if (defined(_MSC_VER) && (_MSC_VER >= 1600)) @@ -133,7 +133,7 @@ void BlobjectAsyncI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb, const vector<Ice::Byte>& inEncaps, const Ice::Current& current) { - Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps); + Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps); vector<Ice::Byte> outEncaps; bool ok = invokeInternal(in, outEncaps, current); cb->ice_response(ok, outEncaps); @@ -144,7 +144,7 @@ BlobjectArrayAsyncI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb, const pair<const Ice::Byte*, const Ice::Byte*>& inEncaps, const Ice::Current& current) { - Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps); + Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps); vector<Ice::Byte> outEncaps; bool ok = invokeInternal(in, outEncaps, current); #if (defined(_MSC_VER) && (_MSC_VER >= 1600)) diff --git a/cpp/test/Ice/location/.depend.mak b/cpp/test/Ice/location/.depend.mak index ccda0512473..93655d918f8 100755 --- a/cpp/test/Ice/location/.depend.mak +++ b/cpp/test/Ice/location/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -120,7 +120,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -150,12 +149,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -164,7 +163,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -176,6 +174,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -204,7 +203,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -252,7 +250,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -282,12 +279,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -296,7 +293,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -308,6 +304,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -336,7 +333,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -384,7 +380,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -414,12 +409,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -428,7 +423,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -440,6 +434,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -468,7 +463,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -513,7 +507,6 @@ ServerLocator.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -543,12 +536,12 @@ ServerLocator.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -557,7 +550,6 @@ ServerLocator.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -569,6 +561,7 @@ ServerLocator.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -597,7 +590,6 @@ ServerLocator.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -646,7 +638,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -676,12 +667,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -690,7 +681,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -702,6 +692,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -730,7 +721,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/logger/.depend.mak b/cpp/test/Ice/logger/.depend.mak index a8828bc2868..1b0683fd241 100755 --- a/cpp/test/Ice/logger/.depend.mak +++ b/cpp/test/Ice/logger/.depend.mak @@ -28,7 +28,6 @@ Client1.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -58,12 +57,12 @@ Client1.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -72,7 +71,6 @@ Client1.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -84,6 +82,7 @@ Client1.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -112,7 +111,6 @@ Client1.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -159,7 +157,6 @@ Client2.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -189,12 +186,12 @@ Client2.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -203,7 +200,6 @@ Client2.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -215,6 +211,7 @@ Client2.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -243,7 +240,6 @@ Client2.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -290,7 +286,6 @@ Client3.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -320,12 +315,12 @@ Client3.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -334,7 +329,6 @@ Client3.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -346,6 +340,7 @@ Client3.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -374,7 +369,6 @@ Client3.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -421,7 +415,6 @@ Client4.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -451,12 +444,12 @@ Client4.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -465,7 +458,6 @@ Client4.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -477,6 +469,7 @@ Client4.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -505,7 +498,6 @@ Client4.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/metrics/.depend.mak b/cpp/test/Ice/metrics/.depend.mak index 85919023ce3..b13a8a0404e 100755 --- a/cpp/test/Ice/metrics/.depend.mak +++ b/cpp/test/Ice/metrics/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -117,7 +117,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -147,12 +146,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -161,7 +160,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -173,6 +171,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -201,7 +200,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -250,7 +248,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -280,12 +277,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -294,7 +291,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -306,6 +302,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -334,7 +331,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -383,7 +379,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -413,12 +408,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -427,7 +422,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -439,6 +433,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -467,7 +462,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -516,7 +510,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -546,12 +539,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -560,7 +553,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -572,6 +564,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -600,7 +593,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -637,7 +629,6 @@ TestAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -674,12 +665,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -694,6 +685,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -733,7 +725,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -763,12 +754,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -777,7 +768,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -789,6 +779,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -817,7 +808,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -861,7 +851,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -891,12 +880,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -905,7 +894,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -917,6 +905,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -945,7 +934,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -994,7 +982,6 @@ Collocated.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1024,12 +1011,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1038,7 +1025,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1050,6 +1036,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1078,7 +1065,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/networkProxy/.depend.mak b/cpp/test/Ice/networkProxy/.depend.mak index 57ca1e61e37..7da8ba7426d 100755 --- a/cpp/test/Ice/networkProxy/.depend.mak +++ b/cpp/test/Ice/networkProxy/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -408,12 +403,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/objects/.depend.mak b/cpp/test/Ice/objects/.depend.mak index bd8e0cbfd23..ab840eb73e0 100755 --- a/cpp/test/Ice/objects/.depend.mak +++ b/cpp/test/Ice/objects/.depend.mak @@ -39,7 +39,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -69,12 +68,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -83,7 +82,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -95,6 +93,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -123,7 +122,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -172,7 +170,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -202,12 +199,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -216,7 +213,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -228,6 +224,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -256,7 +253,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -307,7 +303,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -337,12 +332,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -351,7 +346,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -363,6 +357,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -391,7 +386,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -427,7 +421,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -464,12 +457,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -484,6 +477,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -510,7 +504,6 @@ Derived.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -547,12 +540,12 @@ Derived.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -567,6 +560,7 @@ Derived.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -594,7 +588,6 @@ DerivedEx.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -631,12 +624,12 @@ DerivedEx.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -651,6 +644,7 @@ DerivedEx.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -690,7 +684,6 @@ TestIntfI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -720,12 +713,12 @@ TestIntfI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -734,7 +727,6 @@ TestIntfI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -746,6 +738,7 @@ TestIntfI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -774,7 +767,6 @@ TestIntfI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -825,7 +817,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -855,12 +846,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -869,7 +860,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -881,6 +871,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -909,7 +900,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -958,7 +948,6 @@ Collocated.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -988,12 +977,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1002,7 +991,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1014,6 +1002,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1042,7 +1031,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp index f912dd667a7..20ec8d28eaa 100644 --- a/cpp/test/Ice/objects/AllTests.cpp +++ b/cpp/test/Ice/objects/AllTests.cpp @@ -336,7 +336,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(communicator->findObjectFactory("TestOF")); cout << "ok" << endl; cout << "testing getting ObjectFactory as ValueFactory... " << flush; - test(communicator->findValueFactory("TestOF")); + test(communicator->getValueFactoryManager()->find("TestOF")); cout << "ok" << endl; try diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp index 6a748d724a1..21356269801 100644 --- a/cpp/test/Ice/objects/Client.cpp +++ b/cpp/test/Ice/objects/Client.cpp @@ -121,25 +121,25 @@ int run(int, char**, const Ice::CommunicatorPtr& communicator) { #ifdef ICE_CPP11_MAPPING - communicator->addValueFactory(makeFactory<BI>(), "::Test::B"); - communicator->addValueFactory(makeFactory<CI>(), "::Test::C"); - communicator->addValueFactory(makeFactory<DI>(), "::Test::D"); - communicator->addValueFactory(makeFactory<EI>(), "::Test::E"); - communicator->addValueFactory(makeFactory<FI>(), "::Test::F"); - communicator->addValueFactory(makeFactory<II>(), "::Test::I"); - communicator->addValueFactory(makeFactory<JI>(), "::Test::J"); - communicator->addValueFactory(makeFactory<HI>(), "::Test::H"); + communicator->getValueFactoryManager()->add(makeFactory<BI>(), "::Test::B"); + communicator->getValueFactoryManager()->add(makeFactory<CI>(), "::Test::C"); + communicator->getValueFactoryManager()->add(makeFactory<DI>(), "::Test::D"); + communicator->getValueFactoryManager()->add(makeFactory<EI>(), "::Test::E"); + communicator->getValueFactoryManager()->add(makeFactory<FI>(), "::Test::F"); + communicator->getValueFactoryManager()->add(makeFactory<II>(), "::Test::I"); + communicator->getValueFactoryManager()->add(makeFactory<JI>(), "::Test::J"); + communicator->getValueFactoryManager()->add(makeFactory<HI>(), "::Test::H"); communicator->addObjectFactory(make_shared<MyObjectFactory>(), "TestOF"); #else Ice::ValueFactoryPtr factory = new MyValueFactory; - communicator->addValueFactory(factory, "::Test::B"); - communicator->addValueFactory(factory, "::Test::C"); - communicator->addValueFactory(factory, "::Test::D"); - communicator->addValueFactory(factory, "::Test::E"); - communicator->addValueFactory(factory, "::Test::F"); - communicator->addValueFactory(factory, "::Test::I"); - communicator->addValueFactory(factory, "::Test::J"); - communicator->addValueFactory(factory, "::Test::H"); + communicator->getValueFactoryManager()->add(factory, "::Test::B"); + communicator->getValueFactoryManager()->add(factory, "::Test::C"); + communicator->getValueFactoryManager()->add(factory, "::Test::D"); + communicator->getValueFactoryManager()->add(factory, "::Test::E"); + communicator->getValueFactoryManager()->add(factory, "::Test::F"); + communicator->getValueFactoryManager()->add(factory, "::Test::I"); + communicator->getValueFactoryManager()->add(factory, "::Test::J"); + communicator->getValueFactoryManager()->add(factory, "::Test::H"); communicator->addObjectFactory(new MyObjectFactory(), "TestOF"); #endif diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index 868ff08305c..1c07718968d 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -110,25 +110,25 @@ int run(int, char**, const Ice::CommunicatorPtr& communicator) { #ifdef ICE_CPP11_MAPPING - communicator->addValueFactory(makeFactory<BI>(), "::Test::B"); - communicator->addValueFactory(makeFactory<CI>(), "::Test::C"); - communicator->addValueFactory(makeFactory<DI>(), "::Test::D"); - communicator->addValueFactory(makeFactory<EI>(), "::Test::E"); - communicator->addValueFactory(makeFactory<FI>(), "::Test::F"); - communicator->addValueFactory(makeFactory<II>(), "::Test::I"); - communicator->addValueFactory(makeFactory<JI>(), "::Test::J"); - communicator->addValueFactory(makeFactory<HI>(), "::Test::H"); + communicator->getValueFactoryManager()->add(makeFactory<BI>(), "::Test::B"); + communicator->getValueFactoryManager()->add(makeFactory<CI>(), "::Test::C"); + communicator->getValueFactoryManager()->add(makeFactory<DI>(), "::Test::D"); + communicator->getValueFactoryManager()->add(makeFactory<EI>(), "::Test::E"); + communicator->getValueFactoryManager()->add(makeFactory<FI>(), "::Test::F"); + communicator->getValueFactoryManager()->add(makeFactory<II>(), "::Test::I"); + communicator->getValueFactoryManager()->add(makeFactory<JI>(), "::Test::J"); + communicator->getValueFactoryManager()->add(makeFactory<HI>(), "::Test::H"); communicator->addObjectFactory(make_shared<MyObjectFactory>(), "TestOF"); #else Ice::ValueFactoryPtr factory = new MyValueFactory; - communicator->addValueFactory(factory, "::Test::B"); - communicator->addValueFactory(factory, "::Test::C"); - communicator->addValueFactory(factory, "::Test::D"); - communicator->addValueFactory(factory, "::Test::E"); - communicator->addValueFactory(factory, "::Test::F"); - communicator->addValueFactory(factory, "::Test::I"); - communicator->addValueFactory(factory, "::Test::J"); - communicator->addValueFactory(factory, "::Test::H"); + communicator->getValueFactoryManager()->add(factory, "::Test::B"); + communicator->getValueFactoryManager()->add(factory, "::Test::C"); + communicator->getValueFactoryManager()->add(factory, "::Test::D"); + communicator->getValueFactoryManager()->add(factory, "::Test::E"); + communicator->getValueFactoryManager()->add(factory, "::Test::F"); + communicator->getValueFactoryManager()->add(factory, "::Test::I"); + communicator->getValueFactoryManager()->add(factory, "::Test::J"); + communicator->getValueFactoryManager()->add(factory, "::Test::H"); communicator->addObjectFactory(new MyObjectFactory(), "TestOF"); #endif diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index e0307e2c1ad..c5c4e61849d 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -56,14 +56,14 @@ int run(int, char**, const Ice::CommunicatorPtr& communicator) { #ifdef ICE_CPP11_MAPPING - communicator->addValueFactory(makeFactory<II>(), "::Test::I"); - communicator->addValueFactory(makeFactory<JI>(), "::Test::J"); - communicator->addValueFactory(makeFactory<HI>(), "::Test::H"); + communicator->getValueFactoryManager()->add(makeFactory<II>(), "::Test::I"); + communicator->getValueFactoryManager()->add(makeFactory<JI>(), "::Test::J"); + communicator->getValueFactoryManager()->add(makeFactory<HI>(), "::Test::H"); #else Ice::ValueFactoryPtr factory = new MyValueFactory; - communicator->addValueFactory(factory, "::Test::I"); - communicator->addValueFactory(factory, "::Test::J"); - communicator->addValueFactory(factory, "::Test::H"); + communicator->getValueFactoryManager()->add(factory, "::Test::I"); + communicator->getValueFactoryManager()->add(factory, "::Test::J"); + communicator->getValueFactoryManager()->add(factory, "::Test::H"); #endif communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp index f96cd565ef9..355c27fcf99 100644 --- a/cpp/test/Ice/objects/TestI.cpp +++ b/cpp/test/Ice/objects/TestI.cpp @@ -319,12 +319,12 @@ UnexpectedObjectExceptionTestI::ice_invoke(const std::vector<Ice::Byte>&, const Ice::Current& current) { Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(current.encoding, Ice::DefaultFormat); + Ice::OutputStream out(communicator); + out.startEncapsulation(current.encoding, Ice::DefaultFormat); AlsoEmptyPtr obj = ICE_MAKE_SHARED(AlsoEmpty); - out->write(obj); - out->writePendingObjects(); - out->endEncapsulation(); - out->finished(outParams); + out.write(obj); + out.writePendingObjects(); + out.endEncapsulation(); + out.finished(outParams); return true; } diff --git a/cpp/test/Ice/operations/.depend.mak b/cpp/test/Ice/operations/.depend.mak index e88839ba41c..d3bad3bade7 100755 --- a/cpp/test/Ice/operations/.depend.mak +++ b/cpp/test/Ice/operations/.depend.mak @@ -32,7 +32,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -69,12 +68,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -89,6 +88,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -127,7 +127,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -157,12 +156,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -171,7 +170,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -183,6 +181,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -211,7 +210,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -259,7 +257,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -289,12 +286,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -303,7 +300,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -315,6 +311,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -343,7 +340,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ Twoways.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -421,12 +416,12 @@ Twoways.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ Twoways.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ Twoways.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ Twoways.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -523,7 +517,6 @@ Oneways.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -553,12 +546,12 @@ Oneways.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -567,7 +560,6 @@ Oneways.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -579,6 +571,7 @@ Oneways.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -607,7 +600,6 @@ Oneways.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -655,7 +647,6 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -685,12 +676,12 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -699,7 +690,6 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -711,6 +701,7 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -739,7 +730,6 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -787,7 +777,6 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -817,12 +806,12 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -831,7 +820,6 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -843,6 +831,7 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -871,7 +860,6 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -919,7 +907,6 @@ BatchOneways.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -949,12 +936,12 @@ BatchOneways.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -963,7 +950,6 @@ BatchOneways.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -975,6 +961,7 @@ BatchOneways.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1003,7 +990,6 @@ BatchOneways.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1051,7 +1037,6 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1081,12 +1066,12 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1095,7 +1080,6 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1107,6 +1091,7 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1135,7 +1120,6 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1183,7 +1167,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1213,12 +1196,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1227,7 +1210,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1239,6 +1221,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1267,7 +1250,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1316,7 +1298,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1346,12 +1327,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1360,7 +1341,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1372,6 +1352,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1400,7 +1381,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1437,7 +1417,6 @@ TestAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1474,12 +1453,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1494,6 +1473,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1533,7 +1513,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1563,12 +1542,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1577,7 +1556,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1589,6 +1567,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1617,7 +1596,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1666,7 +1644,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1696,12 +1673,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1710,7 +1687,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1722,6 +1698,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1750,7 +1727,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1799,7 +1775,6 @@ Collocated.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1829,12 +1804,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1843,7 +1818,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1855,6 +1829,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1883,7 +1858,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/optional/.depend.mak b/cpp/test/Ice/optional/.depend.mak index 60a9475cccd..8f2a218fa75 100755 --- a/cpp/test/Ice/optional/.depend.mak +++ b/cpp/test/Ice/optional/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -90,7 +90,6 @@ Test.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -121,7 +120,6 @@ Test.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -164,7 +162,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -194,12 +191,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -208,7 +205,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -220,6 +216,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -248,7 +245,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -294,7 +290,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -324,12 +319,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -338,7 +333,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -350,6 +344,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -378,7 +373,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -429,7 +423,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -459,12 +452,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -473,7 +466,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -485,6 +477,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -513,7 +506,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -563,7 +555,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -593,12 +584,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -607,7 +598,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -619,6 +609,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -647,7 +638,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -686,7 +676,6 @@ TestAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -723,12 +712,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -743,6 +732,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -755,7 +745,6 @@ TestAMD.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -785,7 +774,6 @@ TestAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -828,7 +816,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -858,12 +845,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -872,7 +859,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -884,6 +870,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -912,7 +899,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -958,7 +944,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -988,12 +973,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1002,7 +987,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1014,6 +998,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1042,7 +1027,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/optional/AllTests.cpp b/cpp/test/Ice/optional/AllTests.cpp index 4523f3e62ac..c99c9302685 100644 --- a/cpp/test/Ice/optional/AllTests.cpp +++ b/cpp/test/Ice/optional/AllTests.cpp @@ -14,11 +14,16 @@ using namespace std; using namespace Test; -class TestObjectReader : public Ice::ObjectReader +#ifdef ICE_CPP11_MAPPING +class TestObjectReader : public Ice::Value +#else +class TestObjectReader : public Ice::Object +#endif { public: - virtual void - read(const Ice::InputStreamPtr& in) + virtual void __write(Ice::OutputStream*) const { } + + virtual void __read(Ice::InputStream* in) { in->startObject(); in->startSlice(); @@ -27,11 +32,16 @@ public: } }; -class BObjectReader : public Ice::ObjectReader +#ifdef ICE_CPP11_MAPPING +class BObjectReader : public Ice::Value +#else +class BObjectReader : public Ice::Object +#endif { public: - virtual void - read(const Ice::InputStreamPtr& in) + virtual void __write(Ice::OutputStream*) const { } + + virtual void __read(Ice::InputStream* in) { in->startObject(); // ::Test::B @@ -47,11 +57,16 @@ public: } }; -class CObjectReader : public Ice::ObjectReader +#ifdef ICE_CPP11_MAPPING +class CObjectReader : public Ice::Value +#else +class CObjectReader : public Ice::Object +#endif { public: - virtual void - read(const Ice::InputStreamPtr& in) + virtual void __write(Ice::OutputStream*) const { } + + virtual void __read(Ice::InputStream* in) { in->startObject(); // ::Test::C @@ -70,12 +85,15 @@ public: } }; -class DObjectWriter : public Ice::ObjectWriter +#ifdef ICE_CPP11_MAPPING +class DObjectWriter : public Ice::Value +#else +class DObjectWriter : public Ice::Object +#endif { public: - virtual void - write(const Ice::OutputStreamPtr& out) const + virtual void __write(Ice::OutputStream* out) const { out->startObject(0); // ::Test::D @@ -104,14 +122,20 @@ public: out->endSlice(); out->endObject(); } + + virtual void __read(Ice::InputStream*) { } }; -class DObjectReader : public Ice::ObjectReader +#ifdef ICE_CPP11_MAPPING +class DObjectReader : public Ice::Value +#else +class DObjectReader : public Ice::Object +#endif { public: + virtual void __write(Ice::OutputStream*) const { } - virtual void - read(const Ice::InputStreamPtr& in) + virtual void __read(Ice::InputStream* in) { in->startObject(); // ::Test::D @@ -147,18 +171,22 @@ private: IceUtil::Optional<APtr> a; }; -class FObjectReader : public Ice::ObjectReader +#ifdef ICE_CPP11_MAPPING +class FObjectReader : public Ice::Value +#else +class FObjectReader : public Ice::Object +#endif { public: + virtual void __write(Ice::OutputStream*) const { } - virtual void - read(const Ice::InputStreamPtr& in) + virtual void __read(Ice::InputStream* in) { _f = new F(); in->startObject(); in->startSlice(); // Don't read af on purpose - //in->read(1, _f->af); + //in.read(1, _f->af); in->endSlice(); in->startSlice(); in->read(_f->ae); @@ -235,7 +263,7 @@ InitialPrx allTests(const Ice::CommunicatorPtr& communicator, bool) { FactoryIPtr factory = new FactoryI(); - communicator->addValueFactory(factory, ""); + communicator->getValueFactoryManager()->add(factory, ""); cout << "testing stringToProxy... " << flush; string ref = "initial:" + getTestEndpoint(communicator, 0); @@ -563,39 +591,45 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(mo8->ivsd == mo1->ivsd); test(!mo8->iood); + Ice::ByteSeq inEncaps; + Ice::ByteSeq outEncaps; + // // Send a request using blobjects. Upon receival, we don't read // any of the optional members. This ensures the optional members // are skipped even if the receiver knows nothing about them. // - factory->setEnabled(true); - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(oo1); - out->endEncapsulation(); - Ice::ByteSeq inEncaps; - out->finished(inEncaps); - Ice::ByteSeq outEncaps; - test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - Ice::ObjectPtr obj; - in->read(obj); - in->endEncapsulation(); - test(obj && dynamic_cast<TestObjectReader*>(obj.get())); - - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(mo1); - out->endEncapsulation(); - out->finished(inEncaps); - test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(obj); - in->endEncapsulation(); - test(obj && dynamic_cast<TestObjectReader*>(obj.get())); - factory->setEnabled(false); + { + factory->setEnabled(true); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(oo1); + out.endEncapsulation(); + out.finished(inEncaps); + test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + Ice::ObjectPtr obj; + in.read(obj); + in.endEncapsulation(); + test(obj && dynamic_cast<TestObjectReader*>(obj.get())); + } + + { + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(mo1); + out.endEncapsulation(); + out.finished(inEncaps); + test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + Ice::ObjectPtr obj; + in.read(obj); + in.endEncapsulation(); + test(obj && dynamic_cast<TestObjectReader*>(obj.get())); + factory->setEnabled(false); + } // // Use the 1.0 encoding with operations whose only class parameters are optional. @@ -659,19 +693,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(mc->fss->size() == 300); test(mc->ifsd->size() == 300); - factory->setEnabled(true); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(mc); - out->endEncapsulation(); - out->finished(inEncaps); - test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(obj); - in->endEncapsulation(); - test(obj && dynamic_cast<TestObjectReader*>(obj.get())); - factory->setEnabled(false); + { + factory->setEnabled(true); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(mc); + out.endEncapsulation(); + out.finished(inEncaps); + test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + Ice::ObjectPtr obj; + in.read(obj); + in.endEncapsulation(); + test(obj && dynamic_cast<TestObjectReader*>(obj.get())); + factory->setEnabled(false); + } cout << "ok" << endl; @@ -693,19 +730,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(b2->mc == 12); test(b2->md == 13); - factory->setEnabled(true); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(b); - out->endEncapsulation(); - out->finished(inEncaps); - test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(obj); - in->endEncapsulation(); - test(obj); - factory->setEnabled(false); + { + factory->setEnabled(true); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(b); + out.endEncapsulation(); + out.finished(inEncaps); + test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + Ice::ObjectPtr obj; + in.read(obj); + in.endEncapsulation(); + test(obj); + factory->setEnabled(false); + } cout << "ok" << endl; @@ -720,15 +760,16 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(rf->ae == *rf->af); factory->setEnabled(true); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(f); - out->endEncapsulation(); - out->finished(inEncaps); - in = Ice::createInputStream(communicator, inEncaps); - in->startEncapsulation(); - in->read(obj); - in->endEncapsulation(); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(f); + out.endEncapsulation(); + out.finished(inEncaps); + Ice::InputStream in(communicator, out.getEncoding(), inEncaps); + in.startEncapsulation(); + Ice::ObjectPtr obj; + in.read(obj); + in.endEncapsulation(); factory->setEnabled(false); rf = dynamic_cast<FObjectReader*>(obj.get())->getF(); @@ -754,35 +795,42 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) CPtr c = new C(); c->ss = "test"; c->ms = "testms"; - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(c); - out->endEncapsulation(); - out->finished(inEncaps); - factory->setEnabled(true); - test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(obj); - in->endEncapsulation(); - test(dynamic_cast<CObjectReader*>(obj.get())); - factory->setEnabled(false); - - factory->setEnabled(true); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - Ice::ObjectPtr d = new DObjectWriter(); - out->write(d); - out->endEncapsulation(); - out->finished(inEncaps); - test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(obj); - in->endEncapsulation(); - test(obj && dynamic_cast<DObjectReader*>(obj.get())); - dynamic_cast<DObjectReader*>(obj.get())->check(); - factory->setEnabled(false); + + { + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(c); + out.endEncapsulation(); + out.finished(inEncaps); + factory->setEnabled(true); + test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + Ice::ObjectPtr obj; + in.read(obj); + in.endEncapsulation(); + test(dynamic_cast<CObjectReader*>(obj.get())); + factory->setEnabled(false); + } + + { + factory->setEnabled(true); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + Ice::ObjectPtr d = new DObjectWriter(); + out.write(d); + out.endEncapsulation(); + out.finished(inEncaps); + test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + Ice::ObjectPtr obj; + in.read(obj); + in.endEncapsulation(); + test(obj && dynamic_cast<DObjectReader*>(obj.get())); + dynamic_cast<DObjectReader*>(obj.get())->check(); + factory->setEnabled(false); + } } cout << "ok" << endl; @@ -790,17 +838,17 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) { APtr a = new A(); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(a); - out->write(1, IceUtil::makeOptional(Ice::ObjectPtr(new DObjectWriter))); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(a); + out.write(1, IceUtil::makeOptional(Ice::ObjectPtr(new DObjectWriter))); + out.endEncapsulation(); + out.finished(inEncaps); test(initial->ice_invoke("opClassAndUnknownOptional", Ice::Normal, inEncaps, outEncaps)); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.endEncapsulation(); } cout << "ok" << endl; } @@ -816,26 +864,26 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opByte(p1, p3); test(p2 == 56 && p3 == 56); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opByte", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); IceUtil::Optional<Ice::Byte> p4 = 0x08; - in->read(89, p4); + in.read(89, p4); - in->endEncapsulation(); + in.endEncapsulation(); test(p2 == 56 && p3 == 56 && !p4); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -848,22 +896,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opBool(p1, p3); test(*p2 == true && *p3 == true); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opBool", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(*p2 == true && *p3 == true); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -876,22 +924,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opShort(p1, p3); test(p2 == 56 && p3 == 56); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opShort", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == 56 && p3 == 56); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -904,22 +952,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opInt(p1, p3); test(p2 == 56 && p3 == 56); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opInt", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == 56 && p3 == 56); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -932,22 +980,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opLong(p1, p3); test(p2 == 56 && p3 == 56); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(1, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(1, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opLong", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(2, p3); - in->read(3, p2); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(2, p3); + in.read(3, p2); + in.endEncapsulation(); test(p2 == 56 && p3 == 56); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -960,22 +1008,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opFloat(p1, p3); test(p2 == 1.0f && p3 == 1.0f); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opFloat", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == 1.0f && p3 == 1.0f); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -988,22 +1036,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opDouble(p1, p3); test(p2 == 1.0 && p3 == 1.0); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opDouble", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == 1.0 && p3 == 1.0); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1016,22 +1064,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opString("test", p3); test(p2 == "test" && p3 == "test"); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opString", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == "test" && p3 == "test"); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1046,22 +1094,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opString("test", p3); test(p2 == "test" && p3 == "test"); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opCustomString", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == "test" && p3 == "test"); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } } @@ -1075,22 +1123,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opMyEnum(p1, p3); test(p2 == Test::MyEnumMember && p3 == Test::MyEnumMember); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opMyEnum", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == Test::MyEnumMember && p3 == Test::MyEnumMember); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1104,22 +1152,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opSmallStruct(p1, p3); test(p2->m == 56 && p3->m == 56); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opSmallStruct", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2->m == 56 && p3->m == 56); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1133,22 +1181,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opFixedStruct(p1, p3); test(p2->m == 56 && p3->m == 56); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opFixedStruct", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2->m == 56 && p3->m == 56); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1162,22 +1210,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opVarStruct(p1, p3); test(p2->m == "test" && p3->m == "test"); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opVarStruct", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2->m == "test" && p3->m == "test"); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1190,22 +1238,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opOneOptional(p1, p3); test((*p2)->a == 58 && (*p3)->a == 58); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opOneOptional", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test((*p2)->a == 58 && (*p3)->a == 58); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1218,22 +1266,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opOneOptionalProxy(p1, p3); test(p2 == p1 && p3 == p1); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opOneOptionalProxy", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == p1 && p3 == p1); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1242,18 +1290,18 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) (*f->af)->requiredA = 56; f->ae = *f->af; - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(1, makeOptional(f)); - out->write(2, makeOptional(f->ae)); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(1, makeOptional(f)); + out.write(2, makeOptional(f->ae)); + out.endEncapsulation(); + out.finished(inEncaps); - in = Ice::createInputStream(communicator, inEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), inEncaps); + in.startEncapsulation(); IceUtil::Optional<APtr> a; - in->read(2, a); - in->endEncapsulation(); + in.read(2, a); + in.endEncapsulation(); test(a && *a && (*a)->requiredA == 56); } cout << "ok" << endl; @@ -1277,22 +1325,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == bs && p3 == bs); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opByteSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == bs && p3 == bs); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1314,22 +1362,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == bsv && p3 == bsv); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opBoolSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == bsv && p3 == bsv); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1350,22 +1398,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == bs && p3 == bs); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opShortSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == bs && p3 == bs); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1386,22 +1434,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == bs && p3 == bs); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opIntSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == bs && p3 == bs); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1422,22 +1470,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == bs && p3 == bs); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opLongSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == bs && p3 == bs); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1458,22 +1506,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == bs && p3 == bs); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opFloatSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == bs && p3 == bs); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1494,22 +1542,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == bs && p3 == bs); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opDoubleSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == bs && p3 == bs); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1530,22 +1578,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == ss && p3 == ss); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opStringSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == ss && p3 == ss); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1581,22 +1629,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == fssv && p3 == fssv); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opFixedStructSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == fssv && p3 == fssv); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1616,22 +1664,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == ss && p3 == ss); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opVarStructSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == ss && p3 == ss); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1647,22 +1695,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == ss && p3 == ss); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opIntIntDict", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == ss && p3 == ss); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1678,22 +1726,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == ss && p3 == ss); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opStringIntDict", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == ss && p3 == ss); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1713,25 +1761,25 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2->size() == p1->size()); test((*p2)[5] == ss[5].to_string()); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opCustomIntStringDict", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 && p3); test(p2 == p3); test(p2->size() == p1->size()); test((*p2)[5] == ss[5].to_string()); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } } diff --git a/cpp/test/Ice/plugin/.depend.mak b/cpp/test/Ice/plugin/.depend.mak index 97eef732093..d1b1ce381a5 100755 --- a/cpp/test/Ice/plugin/.depend.mak +++ b/cpp/test/Ice/plugin/.depend.mak @@ -28,7 +28,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -58,12 +57,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -72,7 +71,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -84,6 +82,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -112,7 +111,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -159,7 +157,6 @@ Plugin.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -189,12 +186,12 @@ Plugin.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -203,7 +200,6 @@ Plugin.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -215,6 +211,7 @@ Plugin.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -243,7 +240,6 @@ Plugin.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/properties/.depend.mak b/cpp/test/Ice/properties/.depend.mak index 3a730e043a4..0d2a94f75c6 100755 --- a/cpp/test/Ice/properties/.depend.mak +++ b/cpp/test/Ice/properties/.depend.mak @@ -28,7 +28,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -58,12 +57,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -72,7 +71,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -84,6 +82,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -112,7 +111,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/proxy/.depend.mak b/cpp/test/Ice/proxy/.depend.mak index 7125723adc8..268378de4cd 100755 --- a/cpp/test/Ice/proxy/.depend.mak +++ b/cpp/test/Ice/proxy/.depend.mak @@ -32,7 +32,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -69,12 +68,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -89,6 +88,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -127,7 +127,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -157,12 +156,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -171,7 +170,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -183,6 +181,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -211,7 +210,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -259,7 +257,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -289,12 +286,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -303,7 +300,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -315,6 +311,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -343,7 +340,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -524,7 +518,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -554,12 +547,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -568,7 +561,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -580,6 +572,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -608,7 +601,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -645,7 +637,6 @@ TestAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -682,12 +673,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -702,6 +693,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -741,7 +733,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -771,12 +762,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -785,7 +776,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -797,6 +787,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -825,7 +816,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -874,7 +864,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -904,12 +893,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -918,7 +907,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -930,6 +918,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -958,7 +947,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1007,7 +995,6 @@ Collocated.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1037,12 +1024,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1051,7 +1038,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1063,6 +1049,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1091,7 +1078,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp index 7b0fb058f2c..7803c3957f0 100644 --- a/cpp/test/Ice/proxy/AllTests.cpp +++ b/cpp/test/Ice/proxy/AllTests.cpp @@ -974,11 +974,11 @@ allTests(const Ice::CommunicatorPtr& communicator) { // Send request with bogus 1.2 encoding. Ice::EncodingVersion version = { 1, 2 }; - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->endEncapsulation(); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.endEncapsulation(); vector<Ice::Byte> inEncaps; - out->finished(inEncaps); + out.finished(inEncaps); inEncaps[4] = version.major; inEncaps[5] = version.minor; vector<Ice::Byte> outEncaps; @@ -995,11 +995,11 @@ allTests(const Ice::CommunicatorPtr& communicator) { // Send request with bogus 2.0 encoding. Ice::EncodingVersion version = { 2, 0 }; - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->endEncapsulation(); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.endEncapsulation(); vector<Ice::Byte> inEncaps; - out->finished(inEncaps); + out.finished(inEncaps); inEncaps[4] = version.major; inEncaps[5] = version.minor; vector<Ice::Byte> outEncaps; diff --git a/cpp/test/Ice/retry/.depend.mak b/cpp/test/Ice/retry/.depend.mak index b8e1033fd8e..19980382c04 100755 --- a/cpp/test/Ice/retry/.depend.mak +++ b/cpp/test/Ice/retry/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -247,7 +245,6 @@ InstrumentationI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -277,12 +274,12 @@ InstrumentationI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -291,7 +288,6 @@ InstrumentationI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -303,6 +299,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -331,7 +328,6 @@ InstrumentationI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -408,12 +403,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -512,7 +506,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -542,12 +535,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -556,7 +549,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -568,6 +560,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -596,7 +589,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -641,7 +633,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -671,12 +662,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -685,7 +676,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -697,6 +687,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -725,7 +716,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -774,7 +764,6 @@ Collocated.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -804,12 +793,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -818,7 +807,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -830,6 +818,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -858,7 +847,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/servantLocator/.depend.mak b/cpp/test/Ice/servantLocator/.depend.mak index 5b4f3a20a47..24fc06f8f77 100755 --- a/cpp/test/Ice/servantLocator/.depend.mak +++ b/cpp/test/Ice/servantLocator/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -118,7 +118,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -148,12 +147,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -162,7 +161,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -174,6 +172,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -201,7 +200,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -249,7 +247,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -279,12 +276,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -293,7 +290,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -305,6 +301,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -333,7 +330,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -418,11 +413,11 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -431,7 +426,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -442,6 +436,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -469,7 +464,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -514,7 +508,6 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -544,12 +537,12 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -558,7 +551,6 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -570,6 +562,7 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -598,7 +591,6 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -647,7 +639,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -677,12 +668,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -691,7 +682,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -703,6 +693,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -730,7 +721,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -768,7 +758,6 @@ TestAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -805,12 +794,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -825,6 +814,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -874,7 +864,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -901,11 +890,11 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -914,7 +903,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -925,6 +913,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -952,7 +941,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -997,7 +985,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1027,12 +1014,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1041,7 +1028,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1053,6 +1039,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1080,7 +1067,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1131,7 +1117,6 @@ Collocated.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1161,12 +1146,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1175,7 +1160,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1187,6 +1171,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1214,7 +1199,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/services/.depend.mak b/cpp/test/Ice/services/.depend.mak index ddc45e41f20..da3fe92ac12 100755 --- a/cpp/test/Ice/services/.depend.mak +++ b/cpp/test/Ice/services/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/slicing/exceptions/.depend.mak b/cpp/test/Ice/slicing/exceptions/.depend.mak index f12e8883ec8..f594fa373c1 100755 --- a/cpp/test/Ice/slicing/exceptions/.depend.mak +++ b/cpp/test/Ice/slicing/exceptions/.depend.mak @@ -34,7 +34,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -71,12 +70,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -91,6 +90,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -130,7 +130,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -160,12 +159,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -174,7 +173,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -186,6 +184,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -214,7 +213,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -250,7 +248,6 @@ ClientPrivate.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -287,12 +284,12 @@ ClientPrivate.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -307,6 +304,7 @@ ClientPrivate.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -347,7 +345,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -377,12 +374,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -391,7 +388,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -403,6 +399,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -431,7 +428,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -468,7 +464,6 @@ ServerPrivate.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -505,12 +500,12 @@ ServerPrivate.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -525,6 +520,7 @@ ServerPrivate.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -554,7 +550,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -591,12 +586,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -611,6 +606,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -627,7 +623,6 @@ TestI.obj: \ "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -657,7 +652,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -699,7 +693,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -729,12 +722,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -743,7 +736,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -755,6 +747,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -783,7 +776,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -821,7 +813,6 @@ TestAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -858,12 +849,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -878,6 +869,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -906,7 +898,6 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -943,12 +934,12 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -963,6 +954,7 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -993,7 +985,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1030,12 +1021,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1050,6 +1041,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1061,7 +1053,6 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1091,7 +1082,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1138,7 +1128,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1168,12 +1157,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1182,7 +1171,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1194,6 +1182,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1222,7 +1211,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/slicing/objects/.depend.mak b/cpp/test/Ice/slicing/objects/.depend.mak index 8570865ce91..297023f782c 100755 --- a/cpp/test/Ice/slicing/objects/.depend.mak +++ b/cpp/test/Ice/slicing/objects/.depend.mak @@ -34,7 +34,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -71,12 +70,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -91,6 +90,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -119,7 +119,6 @@ ClientPrivate.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -156,12 +155,12 @@ ClientPrivate.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -176,6 +175,7 @@ ClientPrivate.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -217,7 +217,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -247,12 +246,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -261,7 +260,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -273,6 +271,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -301,7 +300,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -350,7 +348,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -380,12 +377,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -394,7 +391,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -406,6 +402,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -434,7 +431,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -471,7 +467,6 @@ ServerPrivate.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -508,12 +503,12 @@ ServerPrivate.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -528,6 +523,7 @@ ServerPrivate.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -558,7 +554,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -595,12 +590,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -615,6 +610,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -632,7 +628,6 @@ TestI.obj: \ "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -661,7 +656,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -703,7 +697,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -733,12 +726,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -747,7 +740,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -759,6 +751,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -787,7 +780,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -825,7 +817,6 @@ TestAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -862,12 +853,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -882,6 +873,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -910,7 +902,6 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -947,12 +938,12 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -967,6 +958,7 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -997,7 +989,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1034,12 +1025,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1054,6 +1045,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1065,7 +1057,6 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1095,7 +1086,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1142,7 +1132,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1172,12 +1161,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1186,7 +1175,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1198,6 +1186,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1226,7 +1215,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp index 8c145c3606d..2399a8416ef 100644 --- a/cpp/test/Ice/slicing/objects/AllTests.cpp +++ b/cpp/test/Ice/slicing/objects/AllTests.cpp @@ -2875,7 +2875,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Register a factory in order to substitute our own subclass of PNode. This provides // an easy way to determine how many unmarshaled instances currently exist. // - communicator->addValueFactory(new NodeFactoryI, PNode::ice_staticId()); + communicator->getValueFactoryManager()->add(new NodeFactoryI, PNode::ice_staticId()); // // Relay a graph through the server. This test uses a preserved class @@ -2921,7 +2921,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Register a factory in order to substitute our own subclass of Preserved. This provides // an easy way to determine how many unmarshaled instances currently exist. // - communicator->addValueFactory(new PreservedFactoryI, Preserved::ice_staticId()); + communicator->getValueFactoryManager()->add(new PreservedFactoryI, Preserved::ice_staticId()); // // Obtain a preserved object from the server where the most-derived diff --git a/cpp/test/Ice/stream/.depend.mak b/cpp/test/Ice/stream/.depend.mak deleted file mode 100755 index ea866bbbcec..00000000000 --- a/cpp/test/Ice/stream/.depend.mak +++ /dev/null @@ -1,220 +0,0 @@ - -Test.h: \ - Test.ice \ - "$(slicedir)/Ice/BuiltinSequences.ice" - -Test.obj: \ - Test.cpp \ - "Test.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\Ice\Traits.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Value.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\Outgoing.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Stream.h" \ - -Client.obj: \ - Client.cpp \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\Ice\Comparable.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\Ice\Traits.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Value.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Ice\InterfaceByValue.h" \ - "$(top_srcdir)\test\include\TestCommon.h" \ - "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\CtrlCHandler.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "Test.h" \ diff --git a/cpp/test/Ice/stringConverter/.depend.mak b/cpp/test/Ice/stringConverter/.depend.mak index 33079aaa76b..7d3b652ede5 100755 --- a/cpp/test/Ice/stringConverter/.depend.mak +++ b/cpp/test/Ice/stringConverter/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/threadPoolPriority/.depend.mak b/cpp/test/Ice/threadPoolPriority/.depend.mak index e174637df40..c099dedd570 100755 --- a/cpp/test/Ice/threadPoolPriority/.depend.mak +++ b/cpp/test/Ice/threadPoolPriority/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -408,12 +403,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -506,7 +500,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -536,12 +529,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -550,7 +543,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -562,6 +554,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -590,7 +583,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -639,7 +631,6 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -669,12 +660,12 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -683,7 +674,6 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -695,6 +685,7 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -723,7 +714,6 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/timeout/.depend.mak b/cpp/test/Ice/timeout/.depend.mak index 4ae8969d23e..63f62dc0942 100755 --- a/cpp/test/Ice/timeout/.depend.mak +++ b/cpp/test/Ice/timeout/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -103,7 +103,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -140,12 +139,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -160,6 +159,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -175,7 +175,6 @@ TestI.obj: \ "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -205,7 +204,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -247,7 +245,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -277,12 +274,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -291,7 +288,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -303,6 +299,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -331,7 +328,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -379,7 +375,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -409,12 +404,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -423,7 +418,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -435,6 +429,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -463,7 +458,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -512,7 +506,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -542,12 +535,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -556,7 +549,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -568,6 +560,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -596,7 +589,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/udp/.depend.mak b/cpp/test/Ice/udp/.depend.mak index 52141f4e9f5..0358738b757 100755 --- a/cpp/test/Ice/udp/.depend.mak +++ b/cpp/test/Ice/udp/.depend.mak @@ -20,7 +20,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -57,12 +56,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -77,6 +76,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -115,7 +115,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -145,12 +144,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -159,7 +158,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -171,6 +169,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -199,7 +198,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -247,7 +245,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -277,12 +274,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -291,7 +288,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -303,6 +299,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -331,7 +328,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -389,7 +385,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -416,11 +411,11 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -429,7 +424,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -440,6 +434,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -467,7 +462,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -512,7 +506,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -542,12 +535,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -556,7 +549,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -568,6 +560,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -596,7 +589,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceBox/admin/.depend.mak b/cpp/test/IceBox/admin/.depend.mak index fd50df2176d..0a820b59a89 100755 --- a/cpp/test/IceBox/admin/.depend.mak +++ b/cpp/test/IceBox/admin/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -120,7 +120,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -150,12 +149,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -164,7 +163,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -176,6 +174,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -204,7 +203,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -252,7 +250,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -282,12 +279,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -296,7 +293,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -308,6 +304,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -336,7 +333,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -384,7 +380,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -414,12 +409,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -428,7 +423,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -440,6 +434,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -468,7 +463,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -512,7 +506,6 @@ Service.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -542,12 +535,12 @@ Service.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -556,7 +549,6 @@ Service.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -568,6 +560,7 @@ Service.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -596,7 +589,6 @@ Service.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceBox/configuration/.depend.mak b/cpp/test/IceBox/configuration/.depend.mak index 4c256383bcf..1e723fedaf3 100755 --- a/cpp/test/IceBox/configuration/.depend.mak +++ b/cpp/test/IceBox/configuration/.depend.mak @@ -20,7 +20,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -57,12 +56,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -77,6 +76,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -115,7 +115,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -145,12 +144,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -159,7 +158,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -171,6 +169,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -199,7 +198,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -247,7 +245,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -277,12 +274,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -291,7 +288,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -303,6 +299,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -331,7 +328,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -379,7 +375,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -409,12 +404,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -423,7 +418,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -435,6 +429,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -463,7 +458,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -507,7 +501,6 @@ Service.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -537,12 +530,12 @@ Service.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -551,7 +544,6 @@ Service.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -563,6 +555,7 @@ Service.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -591,7 +584,6 @@ Service.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceDiscovery/simple/.depend.mak b/cpp/test/IceDiscovery/simple/.depend.mak index 50715132703..d20f3f25a78 100755 --- a/cpp/test/IceDiscovery/simple/.depend.mak +++ b/cpp/test/IceDiscovery/simple/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -388,7 +384,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -415,11 +410,11 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -428,7 +423,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -439,6 +433,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -466,7 +461,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -511,7 +505,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -541,12 +534,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -555,7 +548,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -567,6 +559,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -595,7 +588,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/activation/.depend.mak b/cpp/test/IceGrid/activation/.depend.mak index f38a88f3577..5f321905ed6 100755 --- a/cpp/test/IceGrid/activation/.depend.mak +++ b/cpp/test/IceGrid/activation/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +513,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -549,12 +542,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +556,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +567,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +596,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/admin/.depend.mak b/cpp/test/IceGrid/admin/.depend.mak index 7ae7d93a717..82d0ceac80e 100755 --- a/cpp/test/IceGrid/admin/.depend.mak +++ b/cpp/test/IceGrid/admin/.depend.mak @@ -28,7 +28,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -58,12 +57,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -72,7 +71,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -84,6 +82,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -112,7 +111,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/allocation/.depend.mak b/cpp/test/IceGrid/allocation/.depend.mak index 752104f8bdb..35fff18b199 100755 --- a/cpp/test/IceGrid/allocation/.depend.mak +++ b/cpp/test/IceGrid/allocation/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -247,7 +245,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -277,12 +274,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -291,7 +288,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -303,6 +299,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -331,7 +328,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -394,7 +390,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -424,12 +419,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -438,7 +433,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -450,6 +444,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -478,7 +473,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -522,7 +516,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -552,12 +545,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -566,7 +559,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -578,6 +570,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -606,7 +599,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -655,7 +647,6 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -685,12 +676,12 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -699,7 +690,6 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -711,6 +701,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -739,7 +730,6 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/deployer/.depend.mak b/cpp/test/IceGrid/deployer/.depend.mak index 3e7dd80159d..51b1d4dc78d 100755 --- a/cpp/test/IceGrid/deployer/.depend.mak +++ b/cpp/test/IceGrid/deployer/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -520,7 +514,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -550,12 +543,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -564,7 +557,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -576,6 +568,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -604,7 +597,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -653,7 +645,6 @@ Service.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -683,12 +674,12 @@ Service.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -697,7 +688,6 @@ Service.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -709,6 +699,7 @@ Service.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -737,7 +728,6 @@ Service.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/distribution/.depend.mak b/cpp/test/IceGrid/distribution/.depend.mak index f08d222094f..f0803234073 100755 --- a/cpp/test/IceGrid/distribution/.depend.mak +++ b/cpp/test/IceGrid/distribution/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +513,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -549,12 +542,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +556,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +567,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +596,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/noRestartUpdate/.depend.mak b/cpp/test/IceGrid/noRestartUpdate/.depend.mak index 4866485c930..91b768f1813 100755 --- a/cpp/test/IceGrid/noRestartUpdate/.depend.mak +++ b/cpp/test/IceGrid/noRestartUpdate/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +513,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -549,12 +542,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +556,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +567,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +596,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -652,7 +644,6 @@ Service.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -682,12 +673,12 @@ Service.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -696,7 +687,6 @@ Service.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -708,6 +698,7 @@ Service.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -736,7 +727,6 @@ Service.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/replicaGroup/.depend.mak b/cpp/test/IceGrid/replicaGroup/.depend.mak index c6ad6879b68..6ba0e7bb953 100755 --- a/cpp/test/IceGrid/replicaGroup/.depend.mak +++ b/cpp/test/IceGrid/replicaGroup/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +513,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -549,12 +542,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +556,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +567,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +596,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -652,7 +644,6 @@ Service.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -682,12 +673,12 @@ Service.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -696,7 +687,6 @@ Service.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -708,6 +698,7 @@ Service.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -736,7 +727,6 @@ Service.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/replication/.depend.mak b/cpp/test/IceGrid/replication/.depend.mak index ce9e93de399..a2706ee8274 100755 --- a/cpp/test/IceGrid/replication/.depend.mak +++ b/cpp/test/IceGrid/replication/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +513,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -549,12 +542,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +556,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +567,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +596,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/session/.depend.mak b/cpp/test/IceGrid/session/.depend.mak index fe9aefc6426..9f79f8a7efc 100755 --- a/cpp/test/IceGrid/session/.depend.mak +++ b/cpp/test/IceGrid/session/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -121,7 +121,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -151,12 +150,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -165,7 +164,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -177,6 +175,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -205,7 +204,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -252,7 +250,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -282,12 +279,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -296,7 +293,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -308,6 +304,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -336,7 +333,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -399,7 +395,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -429,12 +424,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -443,7 +438,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -455,6 +449,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -483,7 +478,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -537,7 +531,6 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -567,12 +560,12 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -581,7 +574,6 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -593,6 +585,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -621,7 +614,6 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/simple/.depend.mak b/cpp/test/IceGrid/simple/.depend.mak index dc5074b13b1..330ed2ecdb5 100755 --- a/cpp/test/IceGrid/simple/.depend.mak +++ b/cpp/test/IceGrid/simple/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -256,7 +254,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -283,11 +280,11 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -296,7 +293,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -307,6 +303,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -334,7 +331,6 @@ AllTests.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +513,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -549,12 +542,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +556,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +567,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +596,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/update/.depend.mak b/cpp/test/IceGrid/update/.depend.mak index f08d222094f..f0803234073 100755 --- a/cpp/test/IceGrid/update/.depend.mak +++ b/cpp/test/IceGrid/update/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +513,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -549,12 +542,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +556,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +567,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +596,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceSSL/configuration/.depend.mak b/cpp/test/IceSSL/configuration/.depend.mak index aabcb9e1181..0a0c7ce7164 100755 --- a/cpp/test/IceSSL/configuration/.depend.mak +++ b/cpp/test/IceSSL/configuration/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -245,7 +243,6 @@ AllTests.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -275,12 +272,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -289,7 +286,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -301,6 +297,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -329,7 +326,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -380,7 +376,6 @@ TestI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -410,12 +405,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -424,7 +419,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -436,6 +430,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -464,7 +459,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -516,7 +510,6 @@ Server.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -546,12 +539,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -560,7 +553,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -572,6 +564,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -600,7 +593,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceStorm/federation/.depend.mak b/cpp/test/IceStorm/federation/.depend.mak index 3b2a6943c61..debbe8fc693 100755 --- a/cpp/test/IceStorm/federation/.depend.mak +++ b/cpp/test/IceStorm/federation/.depend.mak @@ -19,7 +19,6 @@ Event.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Event.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Event.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Publisher.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Publisher.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Publisher.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Publisher.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Publisher.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -244,7 +242,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -274,12 +271,12 @@ Subscriber.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -288,7 +285,6 @@ Subscriber.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -300,6 +296,7 @@ Subscriber.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -328,7 +325,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceStorm/federation2/.depend.mak b/cpp/test/IceStorm/federation2/.depend.mak index 0451f8f7a7e..02a04fbc4a9 100755 --- a/cpp/test/IceStorm/federation2/.depend.mak +++ b/cpp/test/IceStorm/federation2/.depend.mak @@ -19,7 +19,6 @@ Event.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Event.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Event.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -125,7 +125,6 @@ Publisher.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -152,11 +151,11 @@ Publisher.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -165,7 +164,6 @@ Publisher.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -176,6 +174,7 @@ Publisher.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -203,7 +202,6 @@ Publisher.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -249,7 +247,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -279,12 +276,12 @@ Subscriber.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -293,7 +290,6 @@ Subscriber.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -305,6 +301,7 @@ Subscriber.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -333,7 +330,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceStorm/rep1/.depend.mak b/cpp/test/IceStorm/rep1/.depend.mak index 5070e8957be..255665cb3a3 100755 --- a/cpp/test/IceStorm/rep1/.depend.mak +++ b/cpp/test/IceStorm/rep1/.depend.mak @@ -19,7 +19,6 @@ Single.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Single.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Single.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Publisher.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Publisher.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Publisher.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Publisher.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Publisher.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -260,7 +258,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -287,11 +284,11 @@ Subscriber.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -300,7 +297,6 @@ Subscriber.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -311,6 +307,7 @@ Subscriber.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -338,7 +335,6 @@ Subscriber.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -396,7 +392,6 @@ Sub.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -423,11 +418,11 @@ Sub.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -436,7 +431,6 @@ Sub.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ Sub.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -474,7 +469,6 @@ Sub.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceStorm/repgrid/.depend.mak b/cpp/test/IceStorm/repgrid/.depend.mak index 124fbdbe5d0..2ca04ea26a9 100755 --- a/cpp/test/IceStorm/repgrid/.depend.mak +++ b/cpp/test/IceStorm/repgrid/.depend.mak @@ -19,7 +19,6 @@ Single.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Single.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Single.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceStorm/repstress/.depend.mak b/cpp/test/IceStorm/repstress/.depend.mak index 557ae26619e..e2c1c0b9287 100755 --- a/cpp/test/IceStorm/repstress/.depend.mak +++ b/cpp/test/IceStorm/repstress/.depend.mak @@ -22,7 +22,6 @@ Single.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -59,12 +58,12 @@ Single.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Single.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -105,7 +105,6 @@ Controller.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -142,12 +141,12 @@ Controller.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -162,6 +161,7 @@ Controller.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -200,7 +200,6 @@ Publisher.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -230,12 +229,12 @@ Publisher.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -244,7 +243,6 @@ Publisher.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -256,6 +254,7 @@ Publisher.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -284,7 +283,6 @@ Publisher.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -345,7 +343,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -372,11 +369,11 @@ Subscriber.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -385,7 +382,6 @@ Subscriber.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -396,6 +392,7 @@ Subscriber.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -423,7 +420,6 @@ Subscriber.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -471,7 +467,6 @@ Control.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -501,12 +496,12 @@ Control.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -515,7 +510,6 @@ Control.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -527,6 +521,7 @@ Control.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -555,7 +550,6 @@ Control.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceStorm/single/.depend.mak b/cpp/test/IceStorm/single/.depend.mak index e77a0e672d3..37154370675 100755 --- a/cpp/test/IceStorm/single/.depend.mak +++ b/cpp/test/IceStorm/single/.depend.mak @@ -19,7 +19,6 @@ Single.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Single.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Single.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Publisher.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Publisher.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Publisher.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Publisher.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Publisher.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -244,7 +242,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -274,12 +271,12 @@ Subscriber.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -288,7 +285,6 @@ Subscriber.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -300,6 +296,7 @@ Subscriber.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -328,7 +325,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceStorm/stress/.depend.mak b/cpp/test/IceStorm/stress/.depend.mak index 462f2c1348d..9a14d7c48c9 100755 --- a/cpp/test/IceStorm/stress/.depend.mak +++ b/cpp/test/IceStorm/stress/.depend.mak @@ -19,7 +19,6 @@ Event.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Event.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Event.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Publisher.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Publisher.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Publisher.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Publisher.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Publisher.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -276,12 +273,12 @@ Subscriber.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ Subscriber.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ Subscriber.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceUtil/ctrlCHandler/.depend.mak b/cpp/test/IceUtil/ctrlCHandler/.depend.mak index d256efae885..91a2b29b011 100755 --- a/cpp/test/IceUtil/ctrlCHandler/.depend.mak +++ b/cpp/test/IceUtil/ctrlCHandler/.depend.mak @@ -17,7 +17,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ diff --git a/cpp/test/IceUtil/inputUtil/.depend.mak b/cpp/test/IceUtil/inputUtil/.depend.mak index d33d4ecc0c2..3bc42fb1eeb 100755 --- a/cpp/test/IceUtil/inputUtil/.depend.mak +++ b/cpp/test/IceUtil/inputUtil/.depend.mak @@ -25,7 +25,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ diff --git a/cpp/test/IceUtil/priority/.depend.mak b/cpp/test/IceUtil/priority/.depend.mak index ffe99521e63..9a375649658 100755 --- a/cpp/test/IceUtil/priority/.depend.mak +++ b/cpp/test/IceUtil/priority/.depend.mak @@ -67,7 +67,6 @@ ThreadPriority.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -115,7 +114,6 @@ TimerPriority.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -153,7 +151,6 @@ PriorityInversion.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -223,7 +220,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ diff --git a/cpp/test/IceUtil/sha1/.depend.mak b/cpp/test/IceUtil/sha1/.depend.mak index 1112eadfac8..f5bd12d4ac5 100755 --- a/cpp/test/IceUtil/sha1/.depend.mak +++ b/cpp/test/IceUtil/sha1/.depend.mak @@ -19,7 +19,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ diff --git a/cpp/test/IceUtil/stacktrace/.depend.mak b/cpp/test/IceUtil/stacktrace/.depend.mak index ee1be2c67fc..5f569106b50 100755 --- a/cpp/test/IceUtil/stacktrace/.depend.mak +++ b/cpp/test/IceUtil/stacktrace/.depend.mak @@ -18,7 +18,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ diff --git a/cpp/test/IceUtil/thread/.depend.mak b/cpp/test/IceUtil/thread/.depend.mak index f81b387e0de..2f0c09714af 100755 --- a/cpp/test/IceUtil/thread/.depend.mak +++ b/cpp/test/IceUtil/thread/.depend.mak @@ -67,7 +67,6 @@ CreateTest.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -115,7 +114,6 @@ AliveTest.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -163,7 +161,6 @@ StartTest.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -211,7 +208,6 @@ SleepTest.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -259,7 +255,6 @@ RecMutexTest.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -307,7 +302,6 @@ MutexTest.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -355,7 +349,6 @@ MonitorMutexTest.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -403,7 +396,6 @@ MonitorRecMutexTest.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -452,7 +444,6 @@ CountDownLatchTest.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -517,7 +508,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ diff --git a/cpp/test/IceUtil/timer/.depend.mak b/cpp/test/IceUtil/timer/.depend.mak index 487dfe09bee..4250de0cf5e 100755 --- a/cpp/test/IceUtil/timer/.depend.mak +++ b/cpp/test/IceUtil/timer/.depend.mak @@ -26,7 +26,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ diff --git a/cpp/test/IceUtil/unicode/.depend.mak b/cpp/test/IceUtil/unicode/.depend.mak index a770708e39d..de10ef68b48 100755 --- a/cpp/test/IceUtil/unicode/.depend.mak +++ b/cpp/test/IceUtil/unicode/.depend.mak @@ -36,7 +36,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ diff --git a/cpp/test/IceUtil/uuid/.depend.mak b/cpp/test/IceUtil/uuid/.depend.mak index 3957bbbd21e..3eec41d3326 100755 --- a/cpp/test/IceUtil/uuid/.depend.mak +++ b/cpp/test/IceUtil/uuid/.depend.mak @@ -26,7 +26,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ diff --git a/cpp/test/Slice/keyword/.depend.mak b/cpp/test/Slice/keyword/.depend.mak index 83efe265d67..13e51f4d91a 100755 --- a/cpp/test/Slice/keyword/.depend.mak +++ b/cpp/test/Slice/keyword/.depend.mak @@ -19,7 +19,6 @@ Key.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Key.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Key.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -85,7 +85,6 @@ Key.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Stream.h" \ Client.obj: \ Client.cpp \ @@ -116,7 +115,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -146,12 +144,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -160,7 +158,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -172,6 +169,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -200,7 +198,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Slice/keyword/Makefile b/cpp/test/Slice/keyword/Makefile index 01ab8640da0..d984d0ecf01 100644 --- a/cpp/test/Slice/keyword/Makefile +++ b/cpp/test/Slice/keyword/Makefile @@ -21,7 +21,7 @@ OBJS = $(SLICE_OBJS) \ include $(top_srcdir)/config/Make.rules CPPFLAGS := -I. -I../../include $(CPPFLAGS) -SLICE2CPPFLAGS := --underscore --stream $(SLICE2CPPFLAGS) +SLICE2CPPFLAGS := --underscore $(SLICE2CPPFLAGS) $(CLIENT): $(OBJS) rm -f $@ diff --git a/cpp/test/Slice/keyword/Makefile.mak b/cpp/test/Slice/keyword/Makefile.mak index ee1a5929809..2b0fb384027 100644 --- a/cpp/test/Slice/keyword/Makefile.mak +++ b/cpp/test/Slice/keyword/Makefile.mak @@ -21,7 +21,7 @@ OBJS = $(SLICE_OBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -SLICE2CPPFLAGS = --underscore --stream $(SLICE2CPPFLAGS) +SLICE2CPPFLAGS = --underscore $(SLICE2CPPFLAGS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cpp/test/Slice/macros/.depend.mak b/cpp/test/Slice/macros/.depend.mak index 8b814e7072e..a34d81deb58 100755 --- a/cpp/test/Slice/macros/.depend.mak +++ b/cpp/test/Slice/macros/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Slice/parser/.depend.mak b/cpp/test/Slice/parser/.depend.mak index e4555b7a7bd..d35f67a191f 100755 --- a/cpp/test/Slice/parser/.depend.mak +++ b/cpp/test/Slice/parser/.depend.mak @@ -24,7 +24,6 @@ CircularA.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -61,12 +60,12 @@ CircularA.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -81,6 +80,7 @@ CircularA.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -108,7 +108,6 @@ CircularB.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -145,12 +144,12 @@ CircularB.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -165,6 +164,7 @@ CircularB.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ diff --git a/cpp/test/Slice/structure/.depend.mak b/cpp/test/Slice/structure/.depend.mak index 17b798ab2e7..a5c7d3445c8 100755 --- a/cpp/test/Slice/structure/.depend.mak +++ b/cpp/test/Slice/structure/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -105,7 +105,6 @@ Forward.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -142,12 +141,12 @@ Forward.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -156,6 +155,7 @@ Forward.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\OutputStream.h" \ Client.obj: \ Client.cpp \ @@ -186,7 +186,6 @@ Client.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -216,12 +215,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -230,7 +229,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -242,6 +240,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -270,7 +269,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/php/src/IcePHP/Communicator.cpp b/php/src/IcePHP/Communicator.cpp index 12d46ec1809..494b75f9ad2 100644 --- a/php/src/IcePHP/Communicator.cpp +++ b/php/src/IcePHP/Communicator.cpp @@ -31,6 +31,7 @@ namespace IcePHP { zend_class_entry* communicatorClassEntry = 0; +zend_class_entry* valueFactoryManagerClassEntry = 0; // // An active communicator is in use by at least one request and may have @@ -52,9 +53,19 @@ public: }; typedef IceUtil::Handle<ActiveCommunicator> ActiveCommunicatorPtr; -typedef std::map<std::string, zval*> ObjectFactoryMap; -typedef std::map<std::string, zval*> ValueFactoryMap; +class FactoryWrapper; +typedef IceUtil::Handle<FactoryWrapper> FactoryWrapperPtr; +class DefaultValueFactory; +typedef IceUtil::Handle<DefaultValueFactory> DefaultValueFactoryPtr; + +// +// CommunicatorInfoI encapsulates communicator-related information that +// is specific to a PHP "request". In other words, multiple PHP requests +// might share the same communicator instance but still need separate +// workspaces. For example, we don't want the value factories installed +// by one request to influence the behavior of another request. +// class CommunicatorInfoI : public CommunicatorInfo { public: @@ -67,53 +78,110 @@ public: virtual Ice::CommunicatorPtr getCommunicator() const; - bool addObjectFactory(const std::string&, zval* TSRMLS_DC); - bool addValueFactory(const std::string&, zval* TSRMLS_DC); - - bool findObjectFactory(const std::string&, zval* TSRMLS_DC); - bool findValueFactory(const std::string&, zval* TSRMLS_DC); - - void destroyObjectFactories(TSRMLS_D); - void destroyValueFactories(TSRMLS_D); + bool addFactory(zval*, const string&, bool TSRMLS_DC); + FactoryWrapperPtr findFactory(const string&) const; + Ice::ValueFactoryPtr defaultFactory() const { return _defaultFactory; } + void destroyFactories(TSRMLS_D); const ActiveCommunicatorPtr ac; const zval zv; - ObjectFactoryMap objectFactories; - ValueFactoryMap valueFactories; + +private: + + typedef map<string, FactoryWrapperPtr> FactoryMap; + + FactoryMap _factories; + DefaultValueFactoryPtr _defaultFactory; }; typedef IceUtil::Handle<CommunicatorInfoI> CommunicatorInfoIPtr; // +// Wraps a PHP object/value factory. +// +class FactoryWrapper : public Ice::ValueFactory +{ +public: + + FactoryWrapper(zval*, bool, const CommunicatorInfoIPtr&); + + virtual Ice::ValuePtr create(const string&); + + void getZval(zval* TSRMLS_DC); + + bool isObjectFactory() const; + + void destroy(TSRMLS_D); + +protected: + + zval* _factory; + bool _isObjectFactory; + CommunicatorInfoIPtr _info; +}; + +// +// Implements the default value factory behavior. +// +class DefaultValueFactory : public Ice::ValueFactory +{ +public: + + DefaultValueFactory(const CommunicatorInfoIPtr&); + + virtual Ice::ValuePtr create(const string&); + + void setDelegate(const FactoryWrapperPtr& d) { _delegate = d; } + FactoryWrapperPtr getDelegate() const { return _delegate; } + + void destroy(TSRMLS_D); + +private: + + FactoryWrapperPtr _delegate; + CommunicatorInfoIPtr _info; +}; + +// // Each PHP request has its own set of value factories. More precisely, there is // a value factory map for each communicator that is created by a PHP request. -// The factory class defined below delegates the create (and destory in the case -// of an object factory) methods to PHP objects supplied by the application. -// An instance of this class is installed as the communicator's default object -// factory, and the class holds a reference to its communicator. When create is -// invoked, the class resolves the appropriate PHP object as follows: +// (see CommunicatorInfoI). +// +// We define a custom value factory manager implementation that delegates to +// to PHP objects supplied by the application. +// +// An instance of this class is installed as the communicator's value factory +// manager, and the class holds a reference to its communicator. When find() is +// invoked, the class resolves the appropriate factory as follows: // // * Using its communicator reference as the key, look up the corresponding // CommunicatorInfoI object in the request-specific communicator map. // -// * In the object factory map held by the CommunicatorInfoI object, look for a -// PHP factory object using the same algorithm as the Ice core. +// * If the type-id is empty, return the default factory. This factory will +// either delegate to an application-supplied default factory (if present) or +// default-construct an instance of a concrete Slice class type. // -// There is also an object factory map. Anything added to this map is also added -// to the value factory map, but not vice versa. +// * For non-empty type-ids, return a wrapper around the application-supplied +// factory, if any. // -class ObjectFactoryI : public Ice::ObjectFactory +class ValueFactoryManager : public Ice::ValueFactoryManager { public: - ObjectFactoryI(const Ice::CommunicatorPtr&); + virtual void add(const Ice::ValueFactoryPtr&, const string&); + virtual Ice::ValueFactoryPtr find(const string&) const; + + void setCommunicator(const Ice::CommunicatorPtr& c) { _communicator = c; } + Ice::CommunicatorPtr getCommunicator() const { return _communicator; } + + void getZval(zval* TSRMLS_DC); - virtual Ice::ObjectPtr create(const std::string&); - virtual void destroy(); + void destroy(); private: Ice::CommunicatorPtr _communicator; }; +typedef IceUtil::Handle<ValueFactoryManager> ValueFactoryManagerPtr; class ReaperTask : public IceUtil::TimerTask { @@ -132,6 +200,11 @@ namespace zend_object_handlers _handlers; // +// ValueFactoryManager support. +// +zend_object_handlers _vfmHandlers; + +// // The profile map holds Properties objects corresponding to the "default" profile // (defined via the ice.config & ice.options settings in php.ini) as well as named // profiles defined in an external file. @@ -181,6 +254,10 @@ extern "C" static zend_object_value handleAlloc(zend_class_entry* TSRMLS_DC); static void handleFreeStorage(void* TSRMLS_DC); static zend_object_value handleClone(zval* TSRMLS_DC); + +static zend_object_value handleVfmAlloc(zend_class_entry* TSRMLS_DC); +static void handleVfmFreeStorage(void* TSRMLS_DC); +static zend_object_value handleVfmClone(zval* TSRMLS_DC); } ZEND_METHOD(Ice_Communicator, __construct) @@ -208,8 +285,7 @@ ZEND_METHOD(Ice_Communicator, destroy) // // We need to destroy any object|value factories installed by this request. // - _this->destroyObjectFactories(TSRMLS_C); - _this->destroyValueFactories(TSRMLS_C); + _this->destroyFactories(TSRMLS_C); Ice::CommunicatorPtr c = _this->getCommunicator(); assert(c); @@ -218,6 +294,10 @@ ZEND_METHOD(Ice_Communicator, destroy) assert(m->find(c) != m->end()); m->erase(c); + ValueFactoryManagerPtr vfm = ValueFactoryManagerPtr::dynamicCast(c->getValueFactoryManager()); + assert(vfm); + vfm->destroy(); + try { c->destroy(); @@ -447,25 +527,20 @@ ZEND_METHOD(Ice_Communicator, addObjectFactory) type = string(id, idLen); } - if(!_this->addObjectFactory(type, factory TSRMLS_CC)) + if(!_this->addFactory(factory, type, true TSRMLS_CC)) { RETURN_NULL(); } } -ZEND_METHOD(Ice_Communicator, addValueFactory) +ZEND_METHOD(Ice_Communicator, findObjectFactory) { CommunicatorInfoIPtr _this = Wrapper<CommunicatorInfoIPtr>::value(getThis() TSRMLS_CC); assert(_this); - zend_class_entry* factoryClass = idToClass("Ice::ValueFactory" TSRMLS_CC); - assert(factoryClass); - - zval* factory; char* id; int idLen; - if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, const_cast<char*>("Os!"), &factory, factoryClass, &id, - &idLen TSRMLS_CC) != SUCCESS) + if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, const_cast<char*>("s!"), &id, &idLen TSRMLS_CC) != SUCCESS) { RETURN_NULL(); } @@ -476,56 +551,45 @@ ZEND_METHOD(Ice_Communicator, addValueFactory) type = string(id, idLen); } - if(!_this->addValueFactory(type, factory TSRMLS_CC)) + FactoryWrapperPtr w = _this->findFactory(type); + if(w && w->isObjectFactory()) { - RETURN_NULL(); + w->getZval(return_value TSRMLS_CC); } -} - -ZEND_METHOD(Ice_Communicator, findObjectFactory) -{ - CommunicatorInfoIPtr _this = Wrapper<CommunicatorInfoIPtr>::value(getThis() TSRMLS_CC); - assert(_this); - - char* id; - int idLen; - if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, const_cast<char*>("s!"), &id, &idLen TSRMLS_CC) != SUCCESS) + else { RETURN_NULL(); } +} - string type; - if(id) - { - type = string(id, idLen); - } - - if(!_this->findObjectFactory(type, return_value TSRMLS_CC)) +ZEND_METHOD(Ice_Communicator, getValueFactoryManager) +{ + if(ZEND_NUM_ARGS() > 0) { - RETURN_NULL(); + WRONG_PARAM_COUNT; } -} -ZEND_METHOD(Ice_Communicator, findValueFactory) -{ CommunicatorInfoIPtr _this = Wrapper<CommunicatorInfoIPtr>::value(getThis() TSRMLS_CC); assert(_this); - char* id; - int idLen; - if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, const_cast<char*>("s!"), &id, &idLen TSRMLS_CC) != SUCCESS) + try { - RETURN_NULL(); - } + ValueFactoryManagerPtr vfm = + ValueFactoryManagerPtr::dynamicCast(_this->getCommunicator()->getValueFactoryManager()); + assert(vfm); + if(object_init_ex(return_value, valueFactoryManagerClassEntry) != SUCCESS) + { + runtimeError("unable to initialize properties object" TSRMLS_CC); + RETURN_NULL(); + } - string type; - if(id) - { - type = string(id, idLen); + Wrapper<ValueFactoryManagerPtr>* obj = Wrapper<ValueFactoryManagerPtr>::extract(return_value TSRMLS_CC); + assert(!obj->ptr); + obj->ptr = new ValueFactoryManagerPtr(vfm); } - - if(!_this->findValueFactory(type, return_value TSRMLS_CC)) + catch(const IceUtil::Exception& ex) { + throwException(ex TSRMLS_CC); RETURN_NULL(); } } @@ -762,6 +826,83 @@ ZEND_METHOD(Ice_Communicator, flushBatchRequests) } } +ZEND_METHOD(Ice_ValueFactoryManager, __construct) +{ + runtimeError("value factory managers cannot be instantiated directly" TSRMLS_CC); +} + +ZEND_METHOD(Ice_ValueFactoryManager, add) +{ + ValueFactoryManagerPtr _this = Wrapper<ValueFactoryManagerPtr>::value(getThis() TSRMLS_CC); + assert(_this); + + zend_class_entry* factoryClass = idToClass("Ice::ValueFactory" TSRMLS_CC); + assert(factoryClass); + + zval* factory; + char* id; + int idLen; + if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, const_cast<char*>("Os!"), &factory, factoryClass, &id, + &idLen TSRMLS_CC) != SUCCESS) + { + RETURN_NULL(); + } + + string type; + if(id) + { + type = string(id, idLen); + } + + CommunicatorMap* m = static_cast<CommunicatorMap*>(ICE_G(communicatorMap)); + assert(m); + CommunicatorMap::iterator p = m->find(_this->getCommunicator()); + assert(p != m->end()); + + CommunicatorInfoIPtr info = p->second; + + if(!info->addFactory(factory, type, false TSRMLS_CC)) + { + RETURN_NULL(); + } +} + +ZEND_METHOD(Ice_ValueFactoryManager, find) +{ + ValueFactoryManagerPtr _this = Wrapper<ValueFactoryManagerPtr>::value(getThis() TSRMLS_CC); + assert(_this); + + char* id; + int idLen; + if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, const_cast<char*>("s!"), &id, &idLen TSRMLS_CC) != SUCCESS) + { + RETURN_NULL(); + } + + string type; + if(id) + { + type = string(id, idLen); + } + + CommunicatorMap* m = static_cast<CommunicatorMap*>(ICE_G(communicatorMap)); + assert(m); + CommunicatorMap::iterator p = m->find(_this->getCommunicator()); + assert(p != m->end()); + + CommunicatorInfoIPtr info = p->second; + + FactoryWrapperPtr w = info->findFactory(type); + if(w) + { + w->getZval(return_value TSRMLS_CC); + } + else + { + RETURN_NULL(); + } +} + #ifdef _WIN32 extern "C" #endif @@ -801,6 +942,46 @@ handleClone(zval* zv TSRMLS_DC) return zend_object_value(); } +#ifdef _WIN32 +extern "C" +#endif +static zend_object_value +handleVfmAlloc(zend_class_entry* ce TSRMLS_DC) +{ + zend_object_value result; + + Wrapper<ValueFactoryManagerPtr>* obj = Wrapper<ValueFactoryManagerPtr>::create(ce TSRMLS_CC); + assert(obj); + + result.handle = + zend_objects_store_put(obj, 0, (zend_objects_free_object_storage_t)handleVfmFreeStorage, 0 TSRMLS_CC); + result.handlers = &_vfmHandlers; + + return result; +} + +#ifdef _WIN32 +extern "C" +#endif +static void +handleVfmFreeStorage(void* p TSRMLS_DC) +{ + Wrapper<ValueFactoryManagerPtr>* obj = static_cast<Wrapper<ValueFactoryManagerPtr>*>(p); + delete obj->ptr; + zend_object_std_dtor(static_cast<zend_object*>(p) TSRMLS_CC); + efree(p); +} + +#ifdef _WIN32 +extern "C" +#endif +static zend_object_value +handleVfmClone(zval* zv TSRMLS_DC) +{ + php_error_docref(0 TSRMLS_CC, E_ERROR, "value factory managers cannot be cloned"); + return zend_object_value(); +} + static CommunicatorInfoIPtr createCommunicator(zval* zv, const ActiveCommunicatorPtr& ac TSRMLS_DC) { @@ -856,10 +1037,9 @@ initializeCommunicator(zval* zv, Ice::StringSeq& args, bool hasArgs, const Ice:: ActiveCommunicatorPtr ac = new ActiveCommunicator(c); - // - // Install a default object factory that delegates to PHP factories. - // - c->addObjectFactory(new ObjectFactoryI(c), ""); + ValueFactoryManagerPtr vfm = ValueFactoryManagerPtr::dynamicCast(c->getValueFactoryManager()); + assert(vfm); + vfm->setCommunicator(c); CommunicatorInfoIPtr info = createCommunicator(zv, ac TSRMLS_CC); if(!info) @@ -871,6 +1051,8 @@ initializeCommunicator(zval* zv, Ice::StringSeq& args, bool hasArgs, const Ice:: catch(...) { } + + vfm->destroy(); } return info; @@ -962,7 +1144,8 @@ ZEND_FUNCTION(Ice_initialize) string member; member = "properties"; - if(zend_hash_find(Z_OBJPROP_P(zvinit), STRCAST(member.c_str()), static_cast<uint>(member.size() + 1), &data) == SUCCESS) + if(zend_hash_find(Z_OBJPROP_P(zvinit), STRCAST(member.c_str()), static_cast<uint>(member.size() + 1), &data) + == SUCCESS) { zval** val = reinterpret_cast<zval**>(data); if(!fetchProperties(*val, initData.properties TSRMLS_CC)) @@ -972,7 +1155,8 @@ ZEND_FUNCTION(Ice_initialize) } member = "logger"; - if(zend_hash_find(Z_OBJPROP_P(zvinit), STRCAST(member.c_str()), static_cast<uint>(member.size() + 1), &data) == SUCCESS) + if(zend_hash_find(Z_OBJPROP_P(zvinit), STRCAST(member.c_str()), static_cast<uint>(member.size() + 1), &data) + == SUCCESS) { zval** val = reinterpret_cast<zval**>(data); if(!fetchLogger(*val, initData.logger TSRMLS_CC)) @@ -983,6 +1167,7 @@ ZEND_FUNCTION(Ice_initialize) } initData.compactIdResolver = new IdResolver(TSRMLS_C); + initData.valueFactoryManager = new ValueFactoryManager; CommunicatorInfoIPtr info = initializeCommunicator(return_value, seq, hasArgs, initData TSRMLS_CC); if(!info) @@ -1174,7 +1359,6 @@ ZEND_FUNCTION(Ice_getProperties) } } - // // Necessary to suppress warnings from zend_function_entry in php-5.2 // and INI_STR macro. @@ -1202,8 +1386,7 @@ static zend_function_entry _classMethods[] = ZEND_ME(Ice_Communicator, identityToString, NULL, ZEND_ACC_PUBLIC) ZEND_ME(Ice_Communicator, addObjectFactory, NULL, ZEND_ACC_PUBLIC) ZEND_ME(Ice_Communicator, findObjectFactory, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, addValueFactory, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, findValueFactory, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, getValueFactoryManager, NULL, ZEND_ACC_PUBLIC) ZEND_ME(Ice_Communicator, getImplicitContext, NULL, ZEND_ACC_PUBLIC) ZEND_ME(Ice_Communicator, getProperties, NULL, ZEND_ACC_PUBLIC) ZEND_ME(Ice_Communicator, getLogger, NULL, ZEND_ACC_PUBLIC) @@ -1215,6 +1398,21 @@ static zend_function_entry _classMethods[] = {0, 0, 0} }; +// +// Predefined methods for ValueFactoryManager. +// +static zend_function_entry _vfmInterfaceMethods[] = +{ + {0, 0, 0} +}; +static zend_function_entry _vfmClassMethods[] = +{ + ZEND_ME(Ice_ValueFactoryManager, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_ValueFactoryManager, add, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ValueFactoryManager, find, NULL, ZEND_ACC_PUBLIC) + {0, 0, 0} +}; + static bool createProfile(const string& name, const string& config, const string& options TSRMLS_DC) { @@ -1425,6 +1623,26 @@ IcePHP::communicatorInit(TSRMLS_D) zend_class_implements(communicatorClassEntry TSRMLS_CC, 1, interface); // + // Register the ValueFactoryManager interface. + // +#ifdef ICEPHP_USE_NAMESPACES + INIT_NS_CLASS_ENTRY(ce, "Ice", "ValueFactoryManager", _vfmInterfaceMethods); +#else + INIT_CLASS_ENTRY(ce, "Ice_ValueFactoryManager", _vfmInterfaceMethods); +#endif + zend_class_entry* vfmInterface = zend_register_internal_interface(&ce TSRMLS_CC); + + // + // Register the ValueFactoryManager class. + // + INIT_CLASS_ENTRY(ce, "IcePHP_ValueFactoryManager", _vfmClassMethods); + ce.create_object = handleVfmAlloc; + valueFactoryManagerClassEntry = zend_register_internal_class(&ce TSRMLS_CC); + memcpy(&_vfmHandlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + _vfmHandlers.clone_obj = handleVfmClone; + zend_class_implements(valueFactoryManagerClassEntry TSRMLS_CC, 1, vfmInterface); + + // // Create the profiles from configuration settings. // const char* empty = ""; @@ -1518,8 +1736,7 @@ IcePHP::communicatorRequestShutdown(TSRMLS_D) // // We need to destroy any object|value factories installed during this request. // - info->destroyObjectFactories(TSRMLS_C); - info->destroyValueFactories(TSRMLS_C); + info->destroyFactories(TSRMLS_C); } // @@ -1552,168 +1769,131 @@ IcePHP::ActiveCommunicator::~ActiveCommunicator() } } -IcePHP::CommunicatorInfoI::CommunicatorInfoI(const ActiveCommunicatorPtr& c, zval* z) : - ac(c), - zv(*z) // This is legal - it simply copies the object's handle. +IcePHP::FactoryWrapper::FactoryWrapper(zval* factory, bool isObjectFactory, const CommunicatorInfoIPtr& info) : + _factory(factory), + _isObjectFactory(isObjectFactory), + _info(info) { + Z_ADDREF_P(_factory); } -void -IcePHP::CommunicatorInfoI::getZval(zval* z TSRMLS_DC) +Ice::ValuePtr +IcePHP::FactoryWrapper::create(const string& id) { - Z_TYPE_P(z) = IS_OBJECT; - z->value.obj = zv.value.obj; - addRef(TSRMLS_C); -} - -void -IcePHP::CommunicatorInfoI::addRef(TSRMLS_D) -{ - zval* p = const_cast<zval*>(&zv); - Z_OBJ_HT_P(p)->add_ref(p TSRMLS_CC); -} - -void -IcePHP::CommunicatorInfoI::decRef(TSRMLS_D) -{ - zval* p = const_cast<zval*>(&zv); - Z_OBJ_HT(zv)->del_ref(p TSRMLS_CC); -} + // + // Get the TSRM id for the current request. + // + TSRMLS_FETCH(); -Ice::CommunicatorPtr -IcePHP::CommunicatorInfoI::getCommunicator() const -{ - return ac->communicator; -} + // + // Get the type information. + // + ClassInfoPtr cls; + if(id == Ice::Object::ice_staticId()) + { + // + // When the ID is that of Ice::Object, it indicates that the stream has not + // found a factory and is providing us an opportunity to preserve the object. + // + cls = getClassInfoById("::Ice::UnknownSlicedObject" TSRMLS_CC); + } + else + { + cls = getClassInfoById(id TSRMLS_CC); + } -bool -IcePHP::CommunicatorInfoI::addObjectFactory(const string& id, zval* factory TSRMLS_DC) -{ - ObjectFactoryMap::iterator p = objectFactories.find(id); - if(p != objectFactories.end()) + if(!cls) { - Ice::AlreadyRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = "value factory"; - ex.id = id; - throwException(ex TSRMLS_CC); - return false; + return 0; } - objectFactories.insert(ObjectFactoryMap::value_type(id, factory)); - Z_ADDREF_P(factory); - valueFactories.insert(ValueFactoryMap::value_type(id, factory)); - Z_ADDREF_P(factory); + zval* arg; + MAKE_STD_ZVAL(arg); + ZVAL_STRINGL(arg, STRCAST(id.c_str()), static_cast<int>(id.length()), 1); - return true; -} + zval* obj = 0; -bool -IcePHP::CommunicatorInfoI::addValueFactory(const string& id, zval* factory TSRMLS_DC) -{ - ObjectFactoryMap::iterator p = valueFactories.find(id); - if(p != valueFactories.end()) + zend_try { - Ice::AlreadyRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = "value factory"; - ex.id = id; - throwException(ex TSRMLS_CC); - return false; + const char* func = "create"; + zend_call_method(&_factory, 0, 0, const_cast<char*>(func), static_cast<int>(strlen(func)), &obj, 1, arg, + 0 TSRMLS_CC); } + zend_catch + { + obj = 0; + } + zend_end_try(); - valueFactories.insert(ValueFactoryMap::value_type(id, factory)); - Z_ADDREF_P(factory); + zval_ptr_dtor(&arg); - return true; -} - -bool -IcePHP::CommunicatorInfoI::findObjectFactory(const string& id, zval* zv TSRMLS_DC) -{ - ObjectFactoryMap::iterator p = objectFactories.find(id); - if(p != objectFactories.end()) + // + // Bail out if an exception has already been thrown. + // + if(!obj || EG(exception)) { - *zv = *p->second; // This is legal - it simply copies the object's handle. - INIT_PZVAL(zv); - zval_copy_ctor(zv); - return true; + throw AbortMarshaling(); } - return false; -} + AutoDestroy destroy(obj); -bool -IcePHP::CommunicatorInfoI::findValueFactory(const string& id, zval* zv TSRMLS_DC) -{ - ValueFactoryMap::iterator p = valueFactories.find(id); - if(p != valueFactories.end()) + if(Z_TYPE_P(obj) == IS_NULL) { - *zv = *p->second; // This is legal - it simply copies the object's handle. - INIT_PZVAL(zv); - zval_copy_ctor(zv); - return true; + return 0; } - return false; + return new ObjectReader(obj, cls, _info TSRMLS_CC); } void -IcePHP::CommunicatorInfoI::destroyObjectFactories(TSRMLS_D) +IcePHP::FactoryWrapper::getZval(zval* factory TSRMLS_DC) { - for(ObjectFactoryMap::iterator p = objectFactories.begin(); p != objectFactories.end(); ++p) - { - // - // Invoke the destroy method on each registered PHP factory. - // - invokeMethod(p->second, "destroy" TSRMLS_CC); - zend_clear_exception(TSRMLS_C); - zval_ptr_dtor(&p->second); - } - valueFactories.clear(); + *factory = *_factory; // This is legal - it simply copies the object's handle. + INIT_PZVAL(factory); + zval_copy_ctor(factory); +} + +bool +IcePHP::FactoryWrapper::isObjectFactory() const +{ + return _isObjectFactory; } void -IcePHP::CommunicatorInfoI::destroyValueFactories(TSRMLS_D) +IcePHP::FactoryWrapper::destroy(TSRMLS_D) { - for(ObjectFactoryMap::iterator p = objectFactories.begin(); p != objectFactories.end(); ++p) + if(_isObjectFactory) { - zval_ptr_dtor(&p->second); + // + // Invoke the destroy method on the PHP factory. + // + invokeMethod(_factory, "destroy" TSRMLS_CC); + zend_clear_exception(TSRMLS_C); } - objectFactories.clear(); + zval_ptr_dtor(&_factory); + _info = 0; } -IcePHP::ObjectFactoryI::ObjectFactoryI(const Ice::CommunicatorPtr& communicator) : - _communicator(communicator) +IcePHP::DefaultValueFactory::DefaultValueFactory(const CommunicatorInfoIPtr& info) : + _info(info) { } -Ice::ObjectPtr -IcePHP::ObjectFactoryI::create(const string& id) +Ice::ValuePtr +IcePHP::DefaultValueFactory::create(const string& id) { // // Get the TSRM id for the current request. // TSRMLS_FETCH(); - CommunicatorMap* m = static_cast<CommunicatorMap*>(ICE_G(communicatorMap)); - assert(m); - CommunicatorMap::iterator p = m->find(_communicator); - assert(p != m->end()); - - CommunicatorInfoIPtr info = p->second; - - zval* factory = 0; - - // - // Check if the application has registered a factory for this id. - // - ValueFactoryMap::iterator q = info->valueFactories.find(id); - if(q == info->valueFactories.end()) + if(_delegate) { - q = info->valueFactories.find(""); // Look for a default factory. - } - if(q != info->valueFactories.end()) - { - factory = q->second; + Ice::ValuePtr v = _delegate->create(id); + if(v) + { + return v; + } } // @@ -1738,45 +1918,6 @@ IcePHP::ObjectFactoryI::create(const string& id) return 0; } - if(factory) - { - zval* arg; - MAKE_STD_ZVAL(arg); - ZVAL_STRINGL(arg, STRCAST(id.c_str()), static_cast<int>(id.length()), 1); - - zval* obj = 0; - - zend_try - { - const char* func = "create"; - zend_call_method(&factory, 0, 0, const_cast<char*>(func), static_cast<int>(strlen(func)), &obj, 1, arg, 0 TSRMLS_CC); - } - zend_catch - { - obj = 0; - } - zend_end_try(); - - zval_ptr_dtor(&arg); - - // - // Bail out if an exception has already been thrown. - // - if(!obj || EG(exception)) - { - throw AbortMarshaling(); - } - - AutoDestroy destroy(obj); - - if(Z_TYPE_P(obj) == IS_NULL) - { - return 0; - } - - return new ObjectReader(obj, cls, info TSRMLS_CC); - } - // // If the requested type is an abstract class, then we give up. // @@ -1802,11 +1943,155 @@ IcePHP::ObjectFactoryI::create(const string& id) throw AbortMarshaling(); } - return new ObjectReader(obj, cls, info TSRMLS_CC); + return new ObjectReader(obj, cls, _info TSRMLS_CC); +} + +void +IcePHP::DefaultValueFactory::destroy(TSRMLS_D) +{ + if(_delegate) + { + _delegate->destroy(); + _delegate = 0; + } + _info = 0; +} + +IcePHP::CommunicatorInfoI::CommunicatorInfoI(const ActiveCommunicatorPtr& c, zval* z) : + ac(c), + zv(*z), // This is legal - it simply copies the object's handle. + _defaultFactory(new DefaultValueFactory(this)) +{ +} + +void +IcePHP::CommunicatorInfoI::getZval(zval* z TSRMLS_DC) +{ + Z_TYPE_P(z) = IS_OBJECT; + z->value.obj = zv.value.obj; + addRef(TSRMLS_C); +} + +void +IcePHP::CommunicatorInfoI::addRef(TSRMLS_D) +{ + zval* p = const_cast<zval*>(&zv); + Z_OBJ_HT_P(p)->add_ref(p TSRMLS_CC); +} + +void +IcePHP::CommunicatorInfoI::decRef(TSRMLS_D) +{ + zval* p = const_cast<zval*>(&zv); + Z_OBJ_HT(zv)->del_ref(p TSRMLS_CC); +} + +Ice::CommunicatorPtr +IcePHP::CommunicatorInfoI::getCommunicator() const +{ + return ac->communicator; +} + +bool +IcePHP::CommunicatorInfoI::addFactory(zval* factory, const string& id, bool isObjectFactory TSRMLS_DC) +{ + if(id.empty()) + { + if(_defaultFactory->getDelegate()) + { + Ice::AlreadyRegisteredException ex(__FILE__, __LINE__); + ex.kindOfObject = "value factory"; + ex.id = id; + throwException(ex TSRMLS_CC); + return false; + } + + _defaultFactory->setDelegate(new FactoryWrapper(factory, isObjectFactory, this)); + } + else + { + FactoryMap::iterator p = _factories.find(id); + if(p != _factories.end()) + { + Ice::AlreadyRegisteredException ex(__FILE__, __LINE__); + ex.kindOfObject = "value factory"; + ex.id = id; + throwException(ex TSRMLS_CC); + return false; + } + + _factories.insert(FactoryMap::value_type(id, new FactoryWrapper(factory, isObjectFactory, this))); + } + + return true; +} + +FactoryWrapperPtr +IcePHP::CommunicatorInfoI::findFactory(const string& id) const +{ + if(id.empty()) + { + return _defaultFactory->getDelegate(); + } + else + { + FactoryMap::const_iterator p = _factories.find(id); + if(p != _factories.end()) + { + return p->second; + } + } + + return 0; +} + +void +IcePHP::CommunicatorInfoI::destroyFactories(TSRMLS_D) +{ + for(FactoryMap::iterator p = _factories.begin(); p != _factories.end(); ++p) + { + p->second->destroy(TSRMLS_C); + } + _factories.clear(); + _defaultFactory->destroy(TSRMLS_C); +} + +void +IcePHP::ValueFactoryManager::add(const Ice::ValueFactoryPtr&, const string&) +{ + // + // We don't support factories registered in C++. + // + throw Ice::FeatureNotSupportedException(__FILE__, __LINE__, "C++ value factory"); +} + +Ice::ValueFactoryPtr +IcePHP::ValueFactoryManager::find(const string& id) const +{ + // + // Get the TSRM id for the current request. + // + TSRMLS_FETCH(); + + CommunicatorMap* m = static_cast<CommunicatorMap*>(ICE_G(communicatorMap)); + assert(m); + CommunicatorMap::iterator p = m->find(_communicator); + assert(p != m->end()); + + CommunicatorInfoIPtr info = p->second; + + if(id.empty()) + { + return info->defaultFactory(); + } + else + { + return info->findFactory(id); + } } void -IcePHP::ObjectFactoryI::destroy() +IcePHP::ValueFactoryManager::destroy() { _communicator = 0; } diff --git a/php/src/IcePHP/Operation.cpp b/php/src/IcePHP/Operation.cpp index f9fa024811a..a6bb7e4d7ed 100644 --- a/php/src/IcePHP/Operation.cpp +++ b/php/src/IcePHP/Operation.cpp @@ -129,7 +129,7 @@ protected: OperationIPtr _op; - bool prepareRequest(int, zval**, Ice::OutputStreamPtr&, pair<const Ice::Byte*, const Ice::Byte*>& TSRMLS_DC); + bool prepareRequest(int, zval**, Ice::OutputStream*, pair<const Ice::Byte*, const Ice::Byte*>& TSRMLS_DC); void unmarshalResults(int, zval**, zval*, const pair<const Ice::Byte*, const Ice::Byte*>& TSRMLS_DC); zval* unmarshalException(const pair<const Ice::Byte*, const Ice::Byte*>& TSRMLS_DC); bool validateException(const ExceptionInfoPtr& TSRMLS_DC) const; @@ -148,11 +148,11 @@ public: virtual void invoke(INTERNAL_FUNCTION_PARAMETERS); }; -class UserExceptionReaderFactoryI : public Ice::UserExceptionReaderFactory +class UserExceptionFactory : public Ice::UserExceptionFactory { public: - UserExceptionReaderFactoryI(const CommunicatorInfoPtr& communicator TSRMLS_DC) : + UserExceptionFactory(const CommunicatorInfoPtr& communicator TSRMLS_DC) : _communicator(communicator) { #ifdef ZTS @@ -160,7 +160,7 @@ public: #endif } - virtual void createAndThrow(const string& id) const + virtual void createAndThrow(const string& id) { ExceptionInfoPtr info = getExceptionInfo(id TSRMLS_CC); if(info) @@ -460,7 +460,7 @@ IcePHP::TypedInvocation::TypedInvocation(const Ice::ObjectPrx& prx, const Commun } bool -IcePHP::TypedInvocation::prepareRequest(int argc, zval** args, Ice::OutputStreamPtr& os, +IcePHP::TypedInvocation::prepareRequest(int argc, zval** args, Ice::OutputStream* os, pair<const Ice::Byte*, const Ice::Byte*>& params TSRMLS_DC) { // @@ -488,7 +488,6 @@ IcePHP::TypedInvocation::prepareRequest(int argc, zval** args, Ice::OutputStream // // Marshal the in parameters. // - os = Ice::createOutputStream(_communicator->getCommunicator()); os->startEncapsulation(_prx->ice_getEncodingVersion(), _op->format); ObjectMap objectMap; @@ -529,7 +528,7 @@ IcePHP::TypedInvocation::prepareRequest(int argc, zval** args, Ice::OutputStream { ParamInfoPtr info = *p; zval* arg = args[info->pos]; - if(!isUnset(arg TSRMLS_CC) && os->writeOptional(info->tag, info->type->optionalFormat())) + if(!isUnset(arg TSRMLS_CC) && os->writeOpt(info->tag, info->type->optionalFormat())) { info->type->marshal(arg, os, &objectMap, true TSRMLS_CC); } @@ -561,17 +560,17 @@ void IcePHP::TypedInvocation::unmarshalResults(int argc, zval** args, zval* ret, const pair<const Ice::Byte*, const Ice::Byte*>& bytes TSRMLS_DC) { - Ice::InputStreamPtr is = Ice::wrapInputStream(_communicator->getCommunicator(), bytes); + Ice::InputStream is(_communicator->getCommunicator(), bytes); // - // Store a pointer to a local SlicedDataUtil object as the stream's closure. + // Store a pointer to a local StreamUtil object as the stream's closure. // This is necessary to support object unmarshaling (see ObjectReader). // - SlicedDataUtil util; - assert(!is->closure()); - is->closure(&util); + StreamUtil util; + assert(!is.getClosure()); + is.setClosure(&util); - is->startEncapsulation(); + is.startEncapsulation(); ParamInfoList::iterator p; @@ -594,7 +593,7 @@ IcePHP::TypedInvocation::unmarshalResults(int argc, zval** args, zval* ret, { ResultCallbackPtr cb = new ResultCallback; outParamCallbacks[info->pos] = cb; - info->type->unmarshal(is, cb, _communicator, 0, 0, false TSRMLS_CC); + info->type->unmarshal(&is, cb, _communicator, 0, 0, false TSRMLS_CC); } } @@ -604,7 +603,7 @@ IcePHP::TypedInvocation::unmarshalResults(int argc, zval** args, zval* ret, if(_op->returnType && !_op->returnType->optional) { retCallback = new ResultCallback; - _op->returnType->type->unmarshal(is, retCallback, _communicator, 0, 0, false TSRMLS_CC); + _op->returnType->type->unmarshal(&is, retCallback, _communicator, 0, 0, false TSRMLS_CC); } // @@ -624,9 +623,9 @@ IcePHP::TypedInvocation::unmarshalResults(int argc, zval** args, zval* ret, outParamCallbacks[info->pos] = cb; } - if(is->readOptional(info->tag, info->type->optionalFormat())) + if(is.readOpt(info->tag, info->type->optionalFormat())) { - info->type->unmarshal(is, cb, _communicator, 0, 0, true TSRMLS_CC); + info->type->unmarshal(&is, cb, _communicator, 0, 0, true TSRMLS_CC); } else { @@ -636,12 +635,12 @@ IcePHP::TypedInvocation::unmarshalResults(int argc, zval** args, zval* ret, if(_op->returnsClasses) { - is->readPendingObjects(); + is.readPendingObjects(); } - is->endEncapsulation(); + is.endEncapsulation(); - util.update(TSRMLS_C); + util.updateSlicedData(TSRMLS_C); int i = static_cast<int>(_op->inParams.size()); for(ResultCallbackList::iterator q = outParamCallbacks.begin(); q != outParamCallbacks.end(); ++q, ++i) @@ -668,38 +667,38 @@ IcePHP::TypedInvocation::unmarshalResults(int argc, zval** args, zval* ret, zval* IcePHP::TypedInvocation::unmarshalException(const pair<const Ice::Byte*, const Ice::Byte*>& bytes TSRMLS_DC) { - Ice::InputStreamPtr is = Ice::wrapInputStream(_communicator->getCommunicator(), bytes); + Ice::InputStream is(_communicator->getCommunicator(), bytes); // - // Store a pointer to a local SlicedDataUtil object as the stream's closure. + // Store a pointer to a local StreamUtil object as the stream's closure. // This is necessary to support object unmarshaling (see ObjectReader). // - SlicedDataUtil util; - assert(!is->closure()); - is->closure(&util); + StreamUtil util; + assert(!is.getClosure()); + is.setClosure(&util); - is->startEncapsulation(); + is.startEncapsulation(); try { - Ice::UserExceptionReaderFactoryPtr factory = new UserExceptionReaderFactoryI(_communicator TSRMLS_CC); - is->throwException(factory); + Ice::UserExceptionFactoryPtr factory = new UserExceptionFactory(_communicator TSRMLS_CC); + is.throwException(factory); } catch(const ExceptionReader& r) { - is->endEncapsulation(); + is.endEncapsulation(); zval* ex = r.getException(); ExceptionInfoPtr info = r.getInfo(); if(validateException(info TSRMLS_CC)) { - util.update(TSRMLS_C); + util.updateSlicedData(TSRMLS_C); Ice::SlicedDataPtr slicedData = r.getSlicedData(); if(slicedData) { - SlicedDataUtil::setMember(ex, slicedData TSRMLS_CC); + StreamUtil::setSlicedDataMember(ex, slicedData TSRMLS_CC); } return ex; @@ -771,9 +770,9 @@ IcePHP::SyncTypedInvocation::invoke(INTERNAL_FUNCTION_PARAMETERS) return; } - Ice::OutputStreamPtr os; + Ice::OutputStream os(_prx->ice_getCommunicator()); pair<const Ice::Byte*, const Ice::Byte*> params; - if(!prepareRequest(ZEND_NUM_ARGS(), *args, os, params TSRMLS_CC)) + if(!prepareRequest(ZEND_NUM_ARGS(), *args, &os, params TSRMLS_CC)) { return; } diff --git a/php/src/IcePHP/Types.cpp b/php/src/IcePHP/Types.cpp index afc8150e188..2c1c52417cf 100644 --- a/php/src/IcePHP/Types.cpp +++ b/php/src/IcePHP/Types.cpp @@ -227,38 +227,13 @@ IcePHP::getExceptionInfo(const string& id TSRMLS_DC) return 0; } -namespace IcePHP -{ - -class ReadObjectCallback : public Ice::ReadObjectCallback -{ -public: - - ReadObjectCallback(const ClassInfoPtr&, const UnmarshalCallbackPtr&, zval*, void* TSRMLS_DC); - ~ReadObjectCallback(); - - virtual void invoke(const ::Ice::ObjectPtr&); - -private: - - ClassInfoPtr _info; - UnmarshalCallbackPtr _cb; - zval* _target; - void* _closure; -#if ZTS - TSRMLS_D; -#endif -}; - -} - // -// SlicedDataUtil implementation +// StreamUtil implementation // -zend_class_entry* IcePHP::SlicedDataUtil::_slicedDataType = 0; -zend_class_entry* IcePHP::SlicedDataUtil::_sliceInfoType = 0; +zend_class_entry* IcePHP::StreamUtil::_slicedDataType = 0; +zend_class_entry* IcePHP::StreamUtil::_sliceInfoType = 0; -IcePHP::SlicedDataUtil::~SlicedDataUtil() +IcePHP::StreamUtil::~StreamUtil() { // // Make sure we break any cycles among the ObjectReaders in preserved slices. @@ -281,23 +256,29 @@ IcePHP::SlicedDataUtil::~SlicedDataUtil() } void -IcePHP::SlicedDataUtil::add(const ObjectReaderPtr& reader) +IcePHP::StreamUtil::add(const ReadObjectCallbackPtr& callback) +{ + _callbacks.push_back(callback); +} + +void +IcePHP::StreamUtil::add(const ObjectReaderPtr& reader) { assert(reader->getSlicedData()); _readers.insert(reader); } void -IcePHP::SlicedDataUtil::update(TSRMLS_D) +IcePHP::StreamUtil::updateSlicedData(TSRMLS_D) { for(set<ObjectReaderPtr>::iterator p = _readers.begin(); p != _readers.end(); ++p) { - setMember((*p)->getObject(), (*p)->getSlicedData() TSRMLS_CC); + setSlicedDataMember((*p)->getObject(), (*p)->getSlicedData() TSRMLS_CC); } } void -IcePHP::SlicedDataUtil::setMember(zval* obj, const Ice::SlicedDataPtr& slicedData TSRMLS_DC) +IcePHP::StreamUtil::setSlicedDataMember(zval* obj, const Ice::SlicedDataPtr& slicedData TSRMLS_DC) { // // Create a PHP equivalent of the SlicedData object. @@ -454,7 +435,7 @@ IcePHP::SlicedDataUtil::setMember(zval* obj, const Ice::SlicedDataPtr& slicedDat // named _ice_slicedData which is an instance of the PHP class Ice_SlicedData. // Ice::SlicedDataPtr -IcePHP::SlicedDataUtil::getMember(zval* obj, ObjectMap* objectMap TSRMLS_DC) +IcePHP::StreamUtil::getSlicedDataMember(zval* obj, ObjectMap* objectMap TSRMLS_DC) { Ice::SlicedDataPtr slicedData; @@ -846,7 +827,7 @@ IcePHP::PrimitiveInfo::optionalFormat() const } void -IcePHP::PrimitiveInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap*, bool TSRMLS_DC) +IcePHP::PrimitiveInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap*, bool TSRMLS_DC) { switch(kind) { @@ -954,7 +935,7 @@ IcePHP::PrimitiveInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectM } void -IcePHP::PrimitiveInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, +IcePHP::PrimitiveInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, const CommunicatorInfoPtr&, zval* target, void* closure, bool TSRMLS_DC) { zval* zv; @@ -1124,7 +1105,7 @@ IcePHP::EnumInfo::optionalFormat() const } void -IcePHP::EnumInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap*, bool TSRMLS_DC) +IcePHP::EnumInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap*, bool TSRMLS_DC) { assert(Z_TYPE_P(zv) == IS_LONG); // validate() should have caught this. const Ice::Int val = static_cast<Ice::Int>(Z_LVAL_P(zv)); @@ -1134,7 +1115,7 @@ IcePHP::EnumInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap*, } void -IcePHP::EnumInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, +IcePHP::EnumInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, const CommunicatorInfoPtr&, zval* target, void* closure, bool TSRMLS_DC) { zval* zv; @@ -1363,7 +1344,7 @@ IcePHP::StructInfo::usesClasses() const } void -IcePHP::StructInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap* objectMap, bool optional TSRMLS_DC) +IcePHP::StructInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap* objectMap, bool optional TSRMLS_DC) { assert(Z_TYPE_P(zv) == IS_NULL || (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJCE_P(zv) == zce)); @@ -1427,7 +1408,7 @@ IcePHP::StructInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap* } void -IcePHP::StructInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, +IcePHP::StructInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, const CommunicatorInfoPtr& comm, zval* target, void* closure, bool optional TSRMLS_DC) { zval* zv; @@ -1559,7 +1540,7 @@ IcePHP::SequenceInfo::usesClasses() const } void -IcePHP::SequenceInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap* objectMap, bool optional TSRMLS_DC) +IcePHP::SequenceInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap* objectMap, bool optional TSRMLS_DC) { Ice::Int sz = 0; HashTable* arr = 0; @@ -1623,7 +1604,7 @@ IcePHP::SequenceInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMa } void -IcePHP::SequenceInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, +IcePHP::SequenceInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, const CommunicatorInfoPtr& comm, zval* target, void* closure, bool optional TSRMLS_DC) { if(optional) @@ -1719,8 +1700,7 @@ IcePHP::SequenceInfo::destroy() } void -IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* zv, const Ice::OutputStreamPtr& os - TSRMLS_DC) +IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* zv, Ice::OutputStream* os TSRMLS_DC) { HashTable* arr = Z_ARRVAL_P(zv); @@ -1933,14 +1913,14 @@ IcePHP::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, zval* seq[i++] = s; zend_hash_move_forward_ex(arr, &pos); } - os->write(seq, true); + os->write(seq); break; } } } void -IcePHP::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, const Ice::InputStreamPtr& is, +IcePHP::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, Ice::InputStream* is, const UnmarshalCallbackPtr& cb, zval* target, void* closure TSRMLS_DC) { zval* zv; @@ -2119,7 +2099,7 @@ IcePHP::DictionaryInfo::usesClasses() const } void -IcePHP::DictionaryInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap* objectMap, bool optional TSRMLS_DC) +IcePHP::DictionaryInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap* objectMap, bool optional TSRMLS_DC) { Ice::Int sz = 0; HashTable* arr = 0; @@ -2266,7 +2246,7 @@ IcePHP::DictionaryInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, Object } void -IcePHP::DictionaryInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, +IcePHP::DictionaryInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, const CommunicatorInfoPtr& comm, zval* target, void* closure, bool optional TSRMLS_DC) { if(optional) @@ -2548,7 +2528,7 @@ IcePHP::ClassInfo::usesClasses() const } void -IcePHP::ClassInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap* objectMap, bool TSRMLS_DC) +IcePHP::ClassInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap* objectMap, bool TSRMLS_DC) { if(!defined) { @@ -2558,7 +2538,8 @@ IcePHP::ClassInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap* if(Z_TYPE_P(zv) == IS_NULL) { - os->writeObject(0); + Ice::ObjectPtr nil; + os->write(nil); return; } @@ -2587,11 +2568,24 @@ IcePHP::ClassInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap* // // Give the writer to the stream. The stream will eventually call write() on it. // - os->writeObject(writer); + os->write(writer); } +namespace +{ + void -IcePHP::ClassInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, +patchObject(void* addr, const Ice::ObjectPtr& v) +{ + ReadObjectCallback* cb = static_cast<ReadObjectCallback*>(addr); + assert(cb); + cb->invoke(v); +} + +} + +void +IcePHP::ClassInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, const CommunicatorInfoPtr& comm, zval* target, void* closure, bool TSRMLS_DC) { if(!defined) @@ -2600,7 +2594,16 @@ IcePHP::ClassInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallb throw AbortMarshaling(); } - is->readObject(new ReadObjectCallback(this, cb, target, closure TSRMLS_CC)); + // + // This callback is notified when the Slice value is actually read. The StreamUtil object + // attached to the stream keeps a reference to the callback object to ensure it lives + // long enough. + // + ReadObjectCallbackPtr rocb = new ReadObjectCallback(this, cb, target, closure TSRMLS_CC); + StreamUtil* util = reinterpret_cast<StreamUtil*>(is->getClosure()); + assert(util); + util->add(rocb); + is->read(patchObject, rocb.get()); } void @@ -2812,7 +2815,7 @@ IcePHP::ProxyInfo::optionalFormat() const } void -IcePHP::ProxyInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap*, bool optional TSRMLS_DC) +IcePHP::ProxyInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap*, bool optional TSRMLS_DC) { Ice::OutputStream::size_type sizePos = 0; if(optional) @@ -2848,7 +2851,7 @@ IcePHP::ProxyInfo::marshal(zval* zv, const Ice::OutputStreamPtr& os, ObjectMap*, } void -IcePHP::ProxyInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, +IcePHP::ProxyInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, const CommunicatorInfoPtr& comm, zval* target, void* closure, bool optional TSRMLS_DC) { zval* zv; @@ -2956,7 +2959,7 @@ IcePHP::ObjectWriter::ice_preMarshal() } void -IcePHP::ObjectWriter::write(const Ice::OutputStreamPtr& os) const +IcePHP::ObjectWriter::__write(Ice::OutputStream* os) const { Ice::SlicedDataPtr slicedData; @@ -2965,7 +2968,7 @@ IcePHP::ObjectWriter::write(const Ice::OutputStreamPtr& os) const // // Retrieve the SlicedData object that we stored as a hidden member of the PHP object. // - slicedData = SlicedDataUtil::getMember(_object, const_cast<ObjectMap*>(_map) TSRMLS_CC); + slicedData = StreamUtil::getSlicedDataMember(_object, const_cast<ObjectMap*>(_map) TSRMLS_CC); } os->startObject(slicedData); @@ -2992,7 +2995,13 @@ IcePHP::ObjectWriter::write(const Ice::OutputStreamPtr& os) const } void -IcePHP::ObjectWriter::writeMembers(const Ice::OutputStreamPtr& os, const DataMemberList& members) const +IcePHP::ObjectWriter::__read(Ice::InputStream*) +{ + assert(false); +} + +void +IcePHP::ObjectWriter::writeMembers(Ice::OutputStream* os, const DataMemberList& members) const { for(DataMemberList::const_iterator q = members.begin(); q != members.end(); ++q) { @@ -3009,7 +3018,7 @@ IcePHP::ObjectWriter::writeMembers(const Ice::OutputStreamPtr& os, const DataMem zval** val = reinterpret_cast<zval**>(data); if(member->optional && (isUnset(*val TSRMLS_CC) || - !os->writeOptional(member->tag, member->type->optionalFormat()))) + !os->writeOpt(member->tag, member->type->optionalFormat()))) { continue; } @@ -3057,7 +3066,13 @@ IcePHP::ObjectReader::ice_postUnmarshal() } void -IcePHP::ObjectReader::read(const Ice::InputStreamPtr& is) +IcePHP::ObjectReader::__write(Ice::OutputStream*) const +{ + assert(false); +} + +void +IcePHP::ObjectReader::__read(Ice::InputStream* is) { is->startObject(); @@ -3087,7 +3102,7 @@ IcePHP::ObjectReader::read(const Ice::InputStreamPtr& is) for(p = info->optionalMembers.begin(); p != info->optionalMembers.end(); ++p) { DataMemberPtr member = *p; - if(is->readOptional(member->tag, member->type->optionalFormat())) + if(is->readOpt(member->tag, member->type->optionalFormat())) { member->type->unmarshal(is, member, _communicator, _object, 0, true TSRMLS_CC); } @@ -3111,7 +3126,7 @@ IcePHP::ObjectReader::read(const Ice::InputStreamPtr& is) if(_slicedData) { - SlicedDataUtil* util = reinterpret_cast<SlicedDataUtil*>(is->closure()); + StreamUtil* util = reinterpret_cast<StreamUtil*>(is->getClosure()); assert(util); util->add(this); @@ -3216,7 +3231,7 @@ IcePHP::ReadObjectCallback::invoke(const Ice::ObjectPtr& p) // ExceptionInfo implementation. // zval* -IcePHP::ExceptionInfo::unmarshal(const Ice::InputStreamPtr& is, const CommunicatorInfoPtr& comm TSRMLS_DC) +IcePHP::ExceptionInfo::unmarshal(Ice::InputStream* is, const CommunicatorInfoPtr& comm TSRMLS_DC) { zval* zv; MAKE_STD_ZVAL(zv); @@ -3250,7 +3265,7 @@ IcePHP::ExceptionInfo::unmarshal(const Ice::InputStreamPtr& is, const Communicat for(q = info->optionalMembers.begin(); q != info->optionalMembers.end(); ++q) { DataMemberPtr member = *q; - if(is->readOptional(member->tag, member->type->optionalFormat())) + if(is->readOpt(member->tag, member->type->optionalFormat())) { member->type->unmarshal(is, member, comm, zv, 0, true TSRMLS_CC); } @@ -3376,7 +3391,7 @@ IcePHP::ExceptionInfo::isA(const string& typeId) const // IcePHP::ExceptionReader::ExceptionReader(const CommunicatorInfoPtr& communicatorInfo, const ExceptionInfoPtr& info TSRMLS_DC) : - Ice::UserExceptionReader(communicatorInfo->getCommunicator()), _communicatorInfo(communicatorInfo), _info(info) + _communicatorInfo(communicatorInfo), _info(info) { #ifdef ZTS this->TSRMLS_C = TSRMLS_C; @@ -3388,22 +3403,6 @@ IcePHP::ExceptionReader::~ExceptionReader() { } -void -IcePHP::ExceptionReader::read(const Ice::InputStreamPtr& is) const -{ - is->startException(); - - const_cast<zval*&>(_ex) = _info->unmarshal(is, _communicatorInfo TSRMLS_CC); - - const_cast<Ice::SlicedDataPtr&>(_slicedData) = is->endException(_info->preserve); -} - -bool -IcePHP::ExceptionReader::usesClasses() const -{ - return _info->usesClasses; -} - string IcePHP::ExceptionReader::ice_id() const { @@ -3431,6 +3430,28 @@ IcePHP::ExceptionReader::ice_throw() const throw *this; } +void +IcePHP::ExceptionReader::__write(Ice::OutputStream*) const +{ + assert(false); +} + +void +IcePHP::ExceptionReader::__read(Ice::InputStream* is) +{ + is->startException(); + + const_cast<zval*&>(_ex) = _info->unmarshal(is, _communicatorInfo TSRMLS_CC); + + const_cast<Ice::SlicedDataPtr&>(_slicedData) = is->endException(_info->preserve); +} + +bool +IcePHP::ExceptionReader::__usesClasses() const +{ + return _info->usesClasses; +} + ExceptionInfoPtr IcePHP::ExceptionReader::getInfo() const { diff --git a/php/src/IcePHP/Types.h b/php/src/IcePHP/Types.h index 5644ed88c5e..af0f6c01ab1 100644 --- a/php/src/IcePHP/Types.h +++ b/php/src/IcePHP/Types.h @@ -13,7 +13,6 @@ #include <Config.h> #include <Communicator.h> #include <Operation.h> -#include <Ice/Stream.h> #include <IceUtil/OutputUtil.h> // @@ -44,35 +43,15 @@ class AbortMarshaling { }; +class ClassInfo; +typedef IceUtil::Handle<ClassInfo> ClassInfoPtr; +typedef std::vector<ClassInfoPtr> ClassInfoList; + typedef std::map<unsigned int, Ice::ObjectPtr> ObjectMap; class ObjectReader; typedef IceUtil::Handle<ObjectReader> ObjectReaderPtr; -// -// This class keeps track of PHP objects (instances of Slice classes -// and exceptions) that have preserved slices. -// -class SlicedDataUtil -{ -public: - - ~SlicedDataUtil(); - - void add(const ObjectReaderPtr&); - - void update(TSRMLS_D); - - static void setMember(zval*, const Ice::SlicedDataPtr& TSRMLS_DC); - static Ice::SlicedDataPtr getMember(zval*, ObjectMap* TSRMLS_DC); - -private: - - std::set<ObjectReaderPtr> _readers; - static zend_class_entry* _slicedDataType; - static zend_class_entry* _sliceInfoType; -}; - struct PrintObjectHistory { int index; @@ -103,6 +82,64 @@ public: typedef IceUtil::Handle<UnmarshalCallback> UnmarshalCallbackPtr; // +// ReadObjectCallback retains all of the information necessary to store an unmarshaled +// Slice value as a PHP object. +// +class ReadObjectCallback : public IceUtil::Shared +{ +public: + + ReadObjectCallback(const ClassInfoPtr&, const UnmarshalCallbackPtr&, zval*, void* TSRMLS_DC); + ~ReadObjectCallback(); + + virtual void invoke(const ::Ice::ObjectPtr&); + +private: + + ClassInfoPtr _info; + UnmarshalCallbackPtr _cb; + zval* _target; + void* _closure; +#if ZTS + TSRMLS_D; +#endif +}; +typedef IceUtil::Handle<ReadObjectCallback> ReadObjectCallbackPtr; + +// +// This class keeps track of PHP objects (instances of Slice classes +// and exceptions) that have preserved slices. +// +class StreamUtil +{ +public: + + ~StreamUtil(); + + // + // Keep a reference to a ReadObjectCallback for patching purposes. + // + void add(const ReadObjectCallbackPtr&); + + // + // Keep track of object instances that have preserved slices. + // + void add(const ObjectReaderPtr&); + + void updateSlicedData(TSRMLS_D); + + static void setSlicedDataMember(zval*, const Ice::SlicedDataPtr& TSRMLS_DC); + static Ice::SlicedDataPtr getSlicedDataMember(zval*, ObjectMap* TSRMLS_DC); + +private: + + std::vector<ReadObjectCallbackPtr> _callbacks; + std::set<ObjectReaderPtr> _readers; + static zend_class_entry* _slicedDataType; + static zend_class_entry* _sliceInfoType; +}; + +// // Base class for type information. // class TypeInfo : public UnmarshalCallback @@ -133,8 +170,8 @@ public: // The marshal and unmarshal functions can raise Ice exceptions, and may raise // AbortMarshaling if an error occurs. // - virtual void marshal(zval*, const Ice::OutputStreamPtr&, ObjectMap*, bool TSRMLS_DC) = 0; - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, + virtual void marshal(zval*, Ice::OutputStream*, ObjectMap*, bool TSRMLS_DC) = 0; + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, zval*, void*, bool TSRMLS_DC) = 0; virtual void print(zval*, IceUtilInternal::Output&, PrintObjectHistory* TSRMLS_DC) = 0; @@ -156,8 +193,8 @@ public: virtual int wireSize() const; virtual Ice::OptionalFormat optionalFormat() const; - virtual void marshal(zval*, const Ice::OutputStreamPtr&, ObjectMap*, bool TSRMLS_DC); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, + virtual void marshal(zval*, Ice::OutputStream*, ObjectMap*, bool TSRMLS_DC); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, zval*, void*, bool TSRMLS_DC); virtual void print(zval*, IceUtilInternal::Output&, PrintObjectHistory* TSRMLS_DC); @@ -195,8 +232,8 @@ public: virtual int wireSize() const; virtual Ice::OptionalFormat optionalFormat() const; - virtual void marshal(zval*, const Ice::OutputStreamPtr&, ObjectMap*, bool TSRMLS_DC); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, + virtual void marshal(zval*, Ice::OutputStream*, ObjectMap*, bool TSRMLS_DC); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, zval*, void*, bool TSRMLS_DC); virtual void print(zval*, IceUtilInternal::Output&, PrintObjectHistory* TSRMLS_DC); @@ -243,8 +280,8 @@ public: virtual bool usesClasses() const; - virtual void marshal(zval*, const Ice::OutputStreamPtr&, ObjectMap*, bool TSRMLS_DC); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, + virtual void marshal(zval*, Ice::OutputStream*, ObjectMap*, bool TSRMLS_DC); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, zval*, void*, bool TSRMLS_DC); virtual void print(zval*, IceUtilInternal::Output&, PrintObjectHistory* TSRMLS_DC); @@ -283,8 +320,8 @@ public: virtual bool usesClasses() const; - virtual void marshal(zval*, const Ice::OutputStreamPtr&, ObjectMap*, bool TSRMLS_DC); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, + virtual void marshal(zval*, Ice::OutputStream*, ObjectMap*, bool TSRMLS_DC); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, zval*, void*, bool TSRMLS_DC); virtual void print(zval*, IceUtilInternal::Output&, PrintObjectHistory* TSRMLS_DC); @@ -298,8 +335,8 @@ public: private: - void marshalPrimitiveSequence(const PrimitiveInfoPtr&, zval*, const Ice::OutputStreamPtr& TSRMLS_DC); - void unmarshalPrimitiveSequence(const PrimitiveInfoPtr&, const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, + void marshalPrimitiveSequence(const PrimitiveInfoPtr&, zval*, Ice::OutputStream* TSRMLS_DC); + void unmarshalPrimitiveSequence(const PrimitiveInfoPtr&, Ice::InputStream*, const UnmarshalCallbackPtr&, zval*, void* TSRMLS_DC); }; typedef IceUtil::Handle<SequenceInfo> SequenceInfoPtr; @@ -323,8 +360,8 @@ public: virtual bool usesClasses() const; - virtual void marshal(zval*, const Ice::OutputStreamPtr&, ObjectMap*, bool TSRMLS_DC); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, + virtual void marshal(zval*, Ice::OutputStream*, ObjectMap*, bool TSRMLS_DC); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, zval*, void*, bool TSRMLS_DC); virtual void print(zval*, IceUtilInternal::Output&, PrintObjectHistory* TSRMLS_DC); @@ -372,10 +409,6 @@ class ExceptionInfo; typedef IceUtil::Handle<ExceptionInfo> ExceptionInfoPtr; typedef std::vector<ExceptionInfoPtr> ExceptionInfoList; -class ClassInfo; -typedef IceUtil::Handle<ClassInfo> ClassInfoPtr; -typedef std::vector<ClassInfoPtr> ClassInfoList; - typedef std::vector<TypeInfoPtr> TypeInfoList; class ClassInfo : public TypeInfo @@ -396,8 +429,8 @@ public: virtual bool usesClasses() const; - virtual void marshal(zval*, const Ice::OutputStreamPtr&, ObjectMap*, bool TSRMLS_DC); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, + virtual void marshal(zval*, Ice::OutputStream*, ObjectMap*, bool TSRMLS_DC); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, zval*, void*, bool TSRMLS_DC); virtual void print(zval*, IceUtilInternal::Output&, PrintObjectHistory* TSRMLS_DC); @@ -446,8 +479,8 @@ public: virtual int wireSize() const; virtual Ice::OptionalFormat optionalFormat() const; - virtual void marshal(zval*, const Ice::OutputStreamPtr&, ObjectMap*, bool TSRMLS_DC); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, + virtual void marshal(zval*, Ice::OutputStream*, ObjectMap*, bool TSRMLS_DC); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, const CommunicatorInfoPtr&, zval*, void*, bool TSRMLS_DC); virtual void print(zval*, IceUtilInternal::Output&, PrintObjectHistory* TSRMLS_DC); @@ -467,7 +500,7 @@ class ExceptionInfo : public IceUtil::Shared { public: - zval* unmarshal(const Ice::InputStreamPtr&, const CommunicatorInfoPtr& TSRMLS_DC); + zval* unmarshal(Ice::InputStream*, const CommunicatorInfoPtr& TSRMLS_DC); void print(zval*, IceUtilInternal::Output& TSRMLS_DC); void printMembers(zval*, IceUtilInternal::Output&, PrintObjectHistory* TSRMLS_DC); @@ -498,7 +531,7 @@ bool typesRequestShutdown(TSRMLS_D); // // ObjectWriter wraps a PHP object for marshaling. // -class ObjectWriter : public Ice::ObjectWriter +class ObjectWriter : public Ice::Object { public: @@ -507,11 +540,12 @@ public: virtual void ice_preMarshal(); - virtual void write(const Ice::OutputStreamPtr&) const; + virtual void __write(Ice::OutputStream*) const; + virtual void __read(Ice::InputStream*); private: - void writeMembers(const Ice::OutputStreamPtr&, const DataMemberList&) const; + void writeMembers(Ice::OutputStream*, const DataMemberList&) const; zval* _object; ObjectMap* _map; @@ -524,7 +558,7 @@ private: // // ObjectReader unmarshals the state of an Ice object. // -class ObjectReader : public Ice::ObjectReader +class ObjectReader : public Ice::Object { public: @@ -533,7 +567,8 @@ public: virtual void ice_postUnmarshal(); - virtual void read(const Ice::InputStreamPtr&); + virtual void __write(Ice::OutputStream*) const; + virtual void __read(Ice::InputStream*); virtual ClassInfoPtr getInfo() const; @@ -555,16 +590,13 @@ private: // // ExceptionReader creates a PHP user exception and unmarshals it. // -class ExceptionReader : public Ice::UserExceptionReader +class ExceptionReader : public Ice::UserException { public: ExceptionReader(const CommunicatorInfoPtr&, const ExceptionInfoPtr& TSRMLS_DC); ~ExceptionReader() throw(); - virtual void read(const Ice::InputStreamPtr&) const; - virtual bool usesClasses() const; - virtual std::string ice_id() const; #ifndef ICE_CPP11_MAPPING ICE_DEPRECATED_API("ice_name() is deprecated, use ice_id() instead.") @@ -573,12 +605,24 @@ public: virtual ExceptionReader* ice_clone() const; virtual void ice_throw() const; + virtual void __write(Ice::OutputStream*) const; + virtual void __read(Ice::InputStream*); + virtual bool __usesClasses() const; + ExceptionInfoPtr getInfo() const; zval* getException() const; Ice::SlicedDataPtr getSlicedData() const; + using Ice::UserException::__read; + using Ice::UserException::__write; + +protected: + + virtual void __writeImpl(Ice::OutputStream*) const {} + virtual void __readImpl(Ice::InputStream*) {} + private: CommunicatorInfoPtr _communicatorInfo; diff --git a/php/test/Ice/objects/Client.php b/php/test/Ice/objects/Client.php index d50b0d13c95..307717a8e80 100644 --- a/php/test/Ice/objects/Client.php +++ b/php/test/Ice/objects/Client.php @@ -457,7 +457,7 @@ function allTests($communicator) echo "testing getting ObjectFactory as ValueFactory... "; flush(); - test($communicator->findValueFactory("TestOF") != null); + test($communicator->getValueFactoryManager()->find("TestOF") != null); echo "ok\n"; return $initial; @@ -465,14 +465,14 @@ function allTests($communicator) $communicator = Ice_initialize($argv); $factory = new MyValueFactory(); -$communicator->addValueFactory($factory, "::Test::B"); -$communicator->addValueFactory($factory, "::Test::C"); -$communicator->addValueFactory($factory, "::Test::D"); -$communicator->addValueFactory($factory, "::Test::E"); -$communicator->addValueFactory($factory, "::Test::F"); -$communicator->addValueFactory($factory, "::Test::I"); -$communicator->addValueFactory($factory, "::Test::J"); -$communicator->addValueFactory($factory, "::Test::H"); +$communicator->getValueFactoryManager()->add($factory, "::Test::B"); +$communicator->getValueFactoryManager()->add($factory, "::Test::C"); +$communicator->getValueFactoryManager()->add($factory, "::Test::D"); +$communicator->getValueFactoryManager()->add($factory, "::Test::E"); +$communicator->getValueFactoryManager()->add($factory, "::Test::F"); +$communicator->getValueFactoryManager()->add($factory, "::Test::I"); +$communicator->getValueFactoryManager()->add($factory, "::Test::J"); +$communicator->getValueFactoryManager()->add($factory, "::Test::H"); $communicator->addObjectFactory(new MyObjectFactory(), "TestOF"); $initial = allTests($communicator); $initial->shutdown(); diff --git a/python/modules/IcePy/Communicator.cpp b/python/modules/IcePy/Communicator.cpp index 1492c24c1ee..3f2d56e4c32 100644 --- a/python/modules/IcePy/Communicator.cpp +++ b/python/modules/IcePy/Communicator.cpp @@ -16,7 +16,6 @@ #include <ImplicitContext.h> #include <Logger.h> #include <ObjectAdapter.h> -#include <ObjectFactory.h> #include <Operation.h> #include <Properties.h> #include <PropertiesAdmin.h> @@ -24,6 +23,7 @@ #include <Thread.h> #include <Types.h> #include <Util.h> +#include <ValueFactoryManager.h> #include <Ice/ValueFactory.h> #include <Ice/Initialize.h> #include <Ice/CommunicatorAsync.h> @@ -142,12 +142,14 @@ communicatorInit(CommunicatorObject* self, PyObject* args, PyObject* /*kwds*/) bool hasArgs = argList != 0; Ice::InitializationData data; + if(initData) { PyObjectHandle properties = PyObject_GetAttrString(initData, STRCAST("properties")); PyObjectHandle logger = PyObject_GetAttrString(initData, STRCAST("logger")); PyObjectHandle threadHook = PyObject_GetAttrString(initData, STRCAST("threadHook")); PyObjectHandle batchRequestInterceptor = PyObject_GetAttrString(initData, STRCAST("batchRequestInterceptor")); + PyErr_Clear(); // PyObject_GetAttrString sets an error on failure. if(properties.get() && properties.get() != Py_None) @@ -176,6 +178,11 @@ communicatorInit(CommunicatorObject* self, PyObject* args, PyObject* /*kwds*/) } } + // + // We always supply our own implementation of ValueFactoryManager. + // + data.valueFactoryManager = new ValueFactoryManager; + try { if(argList) @@ -254,8 +261,6 @@ communicatorInit(CommunicatorObject* self, PyObject* args, PyObject* /*kwds*/) delete[] argv; self->communicator = new Ice::CommunicatorPtr(communicator); - ObjectFactoryPtr factory = new ObjectFactory; - (*self->communicator)->addObjectFactory(factory, ""); CommunicatorMap::iterator p = _communicatorMap.find(communicator); if(p != _communicatorMap.end()) @@ -302,6 +307,10 @@ static PyObject* communicatorDestroy(CommunicatorObject* self) { assert(self->communicator); + + ValueFactoryManagerPtr vfm = ValueFactoryManagerPtr::dynamicCast((*self->communicator)->getValueFactoryManager()); + assert(vfm); + try { AllowThreads allowThreads; // Release Python's global interpreter lock to avoid a potential deadlock. @@ -310,17 +319,25 @@ communicatorDestroy(CommunicatorObject* self) catch(const Ice::Exception& ex) { setPythonException(ex); - return 0; } + vfm->destroy(); + // // Break cyclic reference between this object and its Python wrapper. // Py_XDECREF(self->wrapper); self->wrapper = 0; - Py_INCREF(Py_None); - return Py_None; + if(PyErr_Occurred()) + { + return 0; + } + else + { + Py_INCREF(Py_None); + return Py_None; + } } #ifdef WIN32 @@ -1169,12 +1186,16 @@ extern "C" static PyObject* communicatorAddObjectFactory(CommunicatorObject* self, PyObject* args) { - PyObject* factoryType = lookupType("Ice.ObjectFactory"); - assert(factoryType); + PyObject* objectFactoryType = lookupType("Ice.ObjectFactory"); + assert(objectFactoryType); + PyObject* valueFactoryType = lookupType("types.FunctionType"); + assert(valueFactoryType); - PyObject* factory; + PyObject* objectFactory; PyObject* strObj; - if(!PyArg_ParseTuple(args, STRCAST("O!O"), factoryType, &factory, &strObj)) + PyObject* valueFactory; + if(!PyArg_ParseTuple(args, STRCAST("O!OO!"), objectFactoryType, &objectFactory, &strObj, valueFactoryType, + &valueFactory)) { return 0; } @@ -1185,55 +1206,12 @@ communicatorAddObjectFactory(CommunicatorObject* self, PyObject* args) return 0; } - ObjectFactoryPtr pof; - try - { - pof = ObjectFactoryPtr::dynamicCast((*self->communicator)->findObjectFactory("")); - assert(pof); - } - catch(const Ice::Exception& ex) - { - setPythonException(ex); - return 0; - - } - - if(!pof->addObjectFactory(factory, id)) - { - return 0; - } - - Py_INCREF(Py_None); - return Py_None; -} - -#ifdef WIN32 -extern "C" -#endif -static PyObject* -communicatorAddValueFactory(CommunicatorObject* self, PyObject* args) -{ - PyObject* factoryType = lookupType("types.FunctionType"); - assert(factoryType); - - PyObject* factory; - PyObject* strObj; - if(!PyArg_ParseTuple(args, STRCAST("O!O"), factoryType, &factory, &strObj)) - { - return 0; - } - - string id; - if(!getStringArg(strObj, "id", id)) - { - return 0; - } + ValueFactoryManagerPtr vfm = ValueFactoryManagerPtr::dynamicCast((*self->communicator)->getValueFactoryManager()); + assert(vfm); - ObjectFactoryPtr pof; try { - pof = ObjectFactoryPtr::dynamicCast((*self->communicator)->findObjectFactory("")); - assert(pof); + vfm->add(valueFactory, objectFactory, id); } catch(const Ice::Exception& ex) { @@ -1242,11 +1220,6 @@ communicatorAddValueFactory(CommunicatorObject* self, PyObject* args) } - if(!pof->addValueFactory(factory, id)) - { - return 0; - } - Py_INCREF(Py_None); return Py_None; } @@ -1269,52 +1242,21 @@ communicatorFindObjectFactory(CommunicatorObject* self, PyObject* args) return 0; } - ObjectFactoryPtr pof; - try - { - pof = ObjectFactoryPtr::dynamicCast((*self->communicator)->findObjectFactory("")); - assert(pof); - } - catch(const Ice::Exception& ex) - { - setPythonException(ex); - return 0; - } + ValueFactoryManagerPtr vfm = ValueFactoryManagerPtr::dynamicCast((*self->communicator)->getValueFactoryManager()); + assert(vfm); - return pof->findObjectFactory(id); + return vfm->findObjectFactory(id); } #ifdef WIN32 extern "C" #endif static PyObject* -communicatorFindValueFactory(CommunicatorObject* self, PyObject* args) +communicatorGetValueFactoryManager(CommunicatorObject* self) { - PyObject* strObj; - if(!PyArg_ParseTuple(args, STRCAST("O"), &strObj)) - { - return 0; - } - - string id; - if(!getStringArg(strObj, "id", id)) - { - return 0; - } - - ObjectFactoryPtr pof; - try - { - pof = ObjectFactoryPtr::dynamicCast((*self->communicator)->findObjectFactory("")); - assert(pof); - } - catch(const Ice::Exception& ex) - { - setPythonException(ex); - return 0; - } + ValueFactoryManagerPtr vfm = ValueFactoryManagerPtr::dynamicCast((*self->communicator)->getValueFactoryManager()); - return pof->findValueFactory(id); + return vfm->getObject(); } #ifdef WIN32 @@ -1648,10 +1590,8 @@ static PyMethodDef CommunicatorMethods[] = PyDoc_STR(STRCAST("addObjectFactory(factory, id) -> None")) }, { STRCAST("findObjectFactory"), reinterpret_cast<PyCFunction>(communicatorFindObjectFactory), METH_VARARGS, PyDoc_STR(STRCAST("findObjectFactory(id) -> Ice.ObjectFactory")) }, - { STRCAST("addValueFactory"), reinterpret_cast<PyCFunction>(communicatorAddValueFactory), METH_VARARGS, - PyDoc_STR(STRCAST("addValueFactory(factory, id) -> None")) }, - { STRCAST("findValueFactory"), reinterpret_cast<PyCFunction>(communicatorFindValueFactory), METH_VARARGS, - PyDoc_STR(STRCAST("findValueFactory(id) -> Ice.ValueFactory")) }, + { STRCAST("getValueFactoryManager"), reinterpret_cast<PyCFunction>(communicatorGetValueFactoryManager), METH_NOARGS, + PyDoc_STR(STRCAST("getValueFactoryManager() -> Ice.ValueFactoryManager")) }, { STRCAST("getImplicitContext"), reinterpret_cast<PyCFunction>(communicatorGetImplicitContext), METH_NOARGS, PyDoc_STR(STRCAST("getImplicitContext() -> Ice.ImplicitContext")) }, { STRCAST("getProperties"), reinterpret_cast<PyCFunction>(communicatorGetProperties), METH_NOARGS, diff --git a/python/modules/IcePy/Connection.cpp b/python/modules/IcePy/Connection.cpp index 2aa28f893df..28f3c69681b 100644 --- a/python/modules/IcePy/Connection.cpp +++ b/python/modules/IcePy/Connection.cpp @@ -232,9 +232,7 @@ connectionCompare(ConnectionObject* c1, PyObject* other, int op) } } - PyObject* r = result ? getTrue() : getFalse(); - Py_INCREF(r); - return r; + return result ? incTrue() : incFalse(); } #ifdef WIN32 diff --git a/python/modules/IcePy/ConnectionInfo.cpp b/python/modules/IcePy/ConnectionInfo.cpp index 2b7750c1cf8..7538c0503f4 100644 --- a/python/modules/IcePy/ConnectionInfo.cpp +++ b/python/modules/IcePy/ConnectionInfo.cpp @@ -56,9 +56,7 @@ extern "C" static PyObject* connectionInfoGetIncoming(ConnectionInfoObject* self) { - PyObject* result = (*self->connectionInfo)->incoming ? getTrue() : getFalse(); - Py_INCREF(result); - return result; + return (*self->connectionInfo)->incoming ? incTrue() : incFalse(); } #ifdef WIN32 @@ -212,9 +210,7 @@ sslConnectionInfoGetVerified(ConnectionInfoObject* self) { IceSSL::ConnectionInfoPtr info = IceSSL::ConnectionInfoPtr::dynamicCast(*self->connectionInfo); assert(info); - PyObject* result = info->incoming ? getTrue() : getFalse(); - Py_INCREF(result); - return result; + return info->incoming ? incTrue() : incFalse(); } #ifdef WIN32 diff --git a/python/modules/IcePy/Endpoint.cpp b/python/modules/IcePy/Endpoint.cpp index 0ee59b6c757..907aa7b12e1 100644 --- a/python/modules/IcePy/Endpoint.cpp +++ b/python/modules/IcePy/Endpoint.cpp @@ -99,9 +99,7 @@ endpointCompare(EndpointObject* p1, PyObject* other, int op) } } - PyObject* r = result ? getTrue() : getFalse(); - Py_INCREF(r); - return r; + return result ? incTrue() : incFalse(); } #ifdef WIN32 diff --git a/python/modules/IcePy/EndpointInfo.cpp b/python/modules/IcePy/EndpointInfo.cpp index 50065c75c13..22579a05160 100644 --- a/python/modules/IcePy/EndpointInfo.cpp +++ b/python/modules/IcePy/EndpointInfo.cpp @@ -135,9 +135,7 @@ extern "C" static PyObject* endpointInfoGetCompress(EndpointInfoObject* self) { - PyObject* result = (*self->endpointInfo)->compress ? getTrue() : getFalse(); - Py_INCREF(result); - return result; + return (*self->endpointInfo)->compress ? incTrue() : incFalse(); } #ifdef WIN32 diff --git a/python/modules/IcePy/ImplicitContext.cpp b/python/modules/IcePy/ImplicitContext.cpp index b1a183b0d47..320e9a422d7 100644 --- a/python/modules/IcePy/ImplicitContext.cpp +++ b/python/modules/IcePy/ImplicitContext.cpp @@ -108,9 +108,7 @@ implicitContextCompare(ImplicitContextObject* c1, PyObject* other, int op) } } - PyObject* r = result ? getTrue() : getFalse(); - Py_INCREF(r); - return r; + return result ? incTrue() : incFalse(); } #ifdef WIN32 diff --git a/python/modules/IcePy/Init.cpp b/python/modules/IcePy/Init.cpp index 0a594104b61..337298eed97 100644 --- a/python/modules/IcePy/Init.cpp +++ b/python/modules/IcePy/Init.cpp @@ -26,6 +26,7 @@ #include <Proxy.h> #include <Slice.h> #include <Types.h> +#include <ValueFactoryManager.h> #include <Ice/Initialize.h> using namespace std; @@ -230,6 +231,10 @@ initIcePy(void) { INIT_RETURN; } + if(!initValueFactoryManager(module)) + { + INIT_RETURN; + } #if PY_VERSION_HEX >= 0x03000000 return module; diff --git a/python/modules/IcePy/Makefile b/python/modules/IcePy/Makefile index 72e252b757f..64f1038dd56 100644 --- a/python/modules/IcePy/Makefile +++ b/python/modules/IcePy/Makefile @@ -26,7 +26,6 @@ OBJS = BatchRequestInterceptor.o \ Init.o \ Logger.o \ ObjectAdapter.o \ - ObjectFactory.o \ Operation.o \ Properties.o \ PropertiesAdmin.o \ @@ -34,7 +33,8 @@ OBJS = BatchRequestInterceptor.o \ Slice.o \ Thread.o \ Types.o \ - Util.o + Util.o \ + ValueFactoryManager.o include $(top_srcdir)/config/Make.rules diff --git a/python/modules/IcePy/Makefile.mak b/python/modules/IcePy/Makefile.mak index 4473a818f67..21085772afa 100644 --- a/python/modules/IcePy/Makefile.mak +++ b/python/modules/IcePy/Makefile.mak @@ -25,7 +25,6 @@ OBJS = .\BatchRequestInterceptor.obj \ .\Init.obj \ .\Logger.obj \ .\ObjectAdapter.obj \ - .\ObjectFactory.obj \ .\Operation.obj \ .\Properties.obj \ .\PropertiesAdmin.obj \ @@ -33,7 +32,8 @@ OBJS = .\BatchRequestInterceptor.obj \ .\Slice.obj \ .\Thread.obj \ .\Types.obj \ - .\Util.obj + .\Util.obj \ + .\ValueFactoryManager.obj # diff --git a/python/modules/IcePy/ObjectAdapter.cpp b/python/modules/IcePy/ObjectAdapter.cpp index f57c58884d1..c81ca4c7143 100644 --- a/python/modules/IcePy/ObjectAdapter.cpp +++ b/python/modules/IcePy/ObjectAdapter.cpp @@ -164,7 +164,7 @@ IcePy::ServantLocatorWrapper::locate(const Ice::Current& current, Ice::LocalObje PyObject* userExceptionType = lookupType("Ice.UserException"); if(PyObject_IsInstance(ex.ex.get(), userExceptionType)) { - throw ExceptionWriter(current.adapter->getCommunicator(), ex.ex); + throw ExceptionWriter(ex.ex); } ex.raise(); @@ -243,7 +243,7 @@ IcePy::ServantLocatorWrapper::finished(const Ice::Current& current, const Ice::O PyObject* userExceptionType = lookupType("Ice.UserException"); if(PyObject_IsInstance(ex.ex.get(), userExceptionType)) { - throw ExceptionWriter(current.adapter->getCommunicator(), ex.ex); + throw ExceptionWriter(ex.ex); } ex.raise(); diff --git a/python/modules/IcePy/ObjectFactory.cpp b/python/modules/IcePy/ObjectFactory.cpp deleted file mode 100644 index 376b5c83697..00000000000 --- a/python/modules/IcePy/ObjectFactory.cpp +++ /dev/null @@ -1,221 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifdef _WIN32 -# include <IceUtil/Config.h> -#endif -#include <ObjectFactory.h> -#include <Thread.h> -#include <Types.h> -#include <Util.h> -#include <Ice/LocalException.h> - -using namespace std; -using namespace IcePy; - -IcePy::ObjectFactory::ObjectFactory() -{ -} - -IcePy::ObjectFactory::~ObjectFactory() -{ - assert(_valueFactoryMap.empty()); - assert(_objectFactoryMap.empty()); -} - -Ice::ObjectPtr -IcePy::ObjectFactory::create(const string& id) -{ - PyObject* factory = 0; - - // - // Check if the application has registered a factory for this id. - // - { - Lock sync(*this); - - FactoryMap::iterator p = _valueFactoryMap.find(id); - if(p != _valueFactoryMap.end()) - { - factory = p->second; - } - } - - // - // Get the type information. - // - ClassInfoPtr info; - if(id == Ice::Object::ice_staticId()) - { - // - // When the ID is that of Ice::Object, it indicates that the stream has not - // found a factory and is providing us an opportunity to preserve the object. - // - info = lookupClassInfo("::Ice::UnknownSlicedObject"); - } - else - { - info = lookupClassInfo(id); - } - - if(!info) - { - return 0; - } - - if(factory) - { - // - // Invoke the create method on the Python factory object. - // - PyObjectHandle obj = PyObject_CallFunction(factory, STRCAST("s"), id.c_str()); - if(!obj.get()) - { - assert(PyErr_Occurred()); - throw AbortMarshaling(); - } - if(obj.get() == Py_None) - { - return 0; - } - return new ObjectReader(obj.get(), info); - } - - // - // If the requested type is an abstract class, then we give up. - // - if(info->isAbstract) - { - return 0; - } - - // - // Instantiate the object. - // - PyTypeObject* type = reinterpret_cast<PyTypeObject*>(info->pythonType.get()); - PyObjectHandle args = PyTuple_New(0); - PyObjectHandle obj = type->tp_new(type, args.get(), 0); - if(!obj.get()) - { - assert(PyErr_Occurred()); - throw AbortMarshaling(); - } - - return new ObjectReader(obj.get(), info); -} - -void -IcePy::ObjectFactory::destroy() -{ - FactoryMap valueFactories; - FactoryMap objectFactories; - - { - Lock sync(*this); - objectFactories = _objectFactoryMap; - valueFactories = _valueFactoryMap; - _valueFactoryMap.clear(); - _objectFactoryMap.clear(); - } - - // - // We release the GIL before calling communicator->destroy(), so we must - // reacquire it before calling back into Python. - // - AdoptThread adoptThread; - - for(FactoryMap::iterator p = _objectFactoryMap.begin(); p != _objectFactoryMap.end(); ++p) - { - // - // Invoke the destroy method on each registered Python "object" factory. - // - PyObjectHandle obj = PyObject_CallMethod(p->second, STRCAST("destroy"), 0); - PyErr_Clear(); // Ignore errors. - Py_DECREF(p->second); - } - for(FactoryMap::iterator p = _valueFactoryMap.begin(); p != _valueFactoryMap.end(); ++p) - { - PyErr_Clear(); // Ignore errors. - Py_DECREF(p->second); - } -} - -bool -IcePy::ObjectFactory::addValueFactory(PyObject* factory, const string& id) -{ - Lock sync(*this); - - FactoryMap::iterator p = _valueFactoryMap.find(id); - if(p != _valueFactoryMap.end()) - { - Ice::AlreadyRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = "value factory"; - ex.id = id; - setPythonException(ex); - return false; - } - - _valueFactoryMap.insert(FactoryMap::value_type(id, factory)); - Py_INCREF(factory); - - return true; -} - -bool -IcePy::ObjectFactory::addObjectFactory(PyObject* factory, const string& id) -{ - Lock sync(*this); - - FactoryMap::iterator p = _valueFactoryMap.find(id); - if(p != _valueFactoryMap.end()) - { - Ice::AlreadyRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = "value factory"; - ex.id = id; - setPythonException(ex); - return false; - } - - _objectFactoryMap.insert(FactoryMap::value_type(id, factory)); - Py_INCREF(factory); - - return true; -} - -PyObject* -IcePy::ObjectFactory::findValueFactory(const string& id) -{ - Lock sync(*this); - - FactoryMap::iterator p = _valueFactoryMap.find(id); - if(p == _valueFactoryMap.end()) - { - Py_INCREF(Py_None); - return Py_None; - } - - Py_INCREF(p->second); - return p->second; -} - -PyObject* -IcePy::ObjectFactory::findObjectFactory(const string& id) -{ - Lock sync(*this); - - FactoryMap::iterator p = _objectFactoryMap.find(id); - if(p == _objectFactoryMap.end()) - { - Py_INCREF(Py_None); - return Py_None; - } - - Py_INCREF(p->second); - return p->second; -} diff --git a/python/modules/IcePy/ObjectFactory.h b/python/modules/IcePy/ObjectFactory.h deleted file mode 100644 index 57b93352bdd..00000000000 --- a/python/modules/IcePy/ObjectFactory.h +++ /dev/null @@ -1,53 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef ICEPY_OBJECT_FACTORY_H -#define ICEPY_OBJECT_FACTORY_H - -#include <Config.h> -#include <Ice/ObjectF.h> -#include <Ice/ObjectFactory.h> -#include <IceUtil/Mutex.h> - -namespace IcePy -{ - -// -// Each communicator registers an instance of ObjectFactory as its -// default object factory. This instance delegates to registered Python -// objects, and instantiates concrete classes when no factory is present. -// -class ObjectFactory : public Ice::ObjectFactory, public IceUtil::Mutex -{ -public: - - ObjectFactory(); - ~ObjectFactory(); - - virtual Ice::ObjectPtr create(const std::string&); - - virtual void destroy(); - - bool addValueFactory(PyObject*, const std::string&); - bool addObjectFactory(PyObject*, const std::string&); - - PyObject* findValueFactory(const std::string&); - PyObject* findObjectFactory(const std::string&); - -private: - - typedef std::map<std::string, PyObject*> FactoryMap; - FactoryMap _valueFactoryMap; - FactoryMap _objectFactoryMap; -}; -typedef IceUtil::Handle<ObjectFactory> ObjectFactoryPtr; - -} - -#endif diff --git a/python/modules/IcePy/Operation.cpp b/python/modules/IcePy/Operation.cpp index 42cb836fa9b..696f3291214 100644 --- a/python/modules/IcePy/Operation.cpp +++ b/python/modules/IcePy/Operation.cpp @@ -125,7 +125,7 @@ protected: enum MappingType { SyncMapping, AsyncMapping, OldAsyncMapping }; - bool prepareRequest(PyObject*, MappingType, Ice::OutputStreamPtr&, pair<const Ice::Byte*, const Ice::Byte*>&); + bool prepareRequest(PyObject*, MappingType, Ice::OutputStream*, pair<const Ice::Byte*, const Ice::Byte*>&); PyObject* unmarshalResults(const pair<const Ice::Byte*, const Ice::Byte*>&); PyObject* unmarshalException(const pair<const Ice::Byte*, const Ice::Byte*>&); bool validateException(PyObject*) const; @@ -378,27 +378,18 @@ struct AsyncResultObject extern PyTypeObject OperationType; extern PyTypeObject AMDCallbackType; -class UserExceptionReaderFactoryI : public Ice::UserExceptionReaderFactory +class UserExceptionFactory : public Ice::UserExceptionFactory { public: - UserExceptionReaderFactoryI(const Ice::CommunicatorPtr& communicator) : - _communicator(communicator) - { - } - - virtual void createAndThrow(const string& id) const + virtual void createAndThrow(const string& id) { ExceptionInfoPtr info = lookupExceptionInfo(id); if(info) { - throw ExceptionReader(_communicator, info); + throw ExceptionReader(info); } } - -private: - - const Ice::CommunicatorPtr _communicator; }; } @@ -1498,7 +1489,7 @@ IcePy::TypedInvocation::TypedInvocation(const Ice::ObjectPrx& prx, const Operati } bool -IcePy::TypedInvocation::prepareRequest(PyObject* args, MappingType mapping, Ice::OutputStreamPtr& os, +IcePy::TypedInvocation::prepareRequest(PyObject* args, MappingType mapping, Ice::OutputStream* os, pair<const Ice::Byte*, const Ice::Byte*>& params) { assert(PyTuple_Check(args)); @@ -1536,7 +1527,6 @@ IcePy::TypedInvocation::prepareRequest(PyObject* args, MappingType mapping, Ice: // // Marshal the in parameters. // - os = Ice::createOutputStream(_communicator); os->startEncapsulation(_prx->ice_getEncodingVersion(), _op->format); ObjectMap objectMap; @@ -1591,7 +1581,7 @@ IcePy::TypedInvocation::prepareRequest(PyObject* args, MappingType mapping, Ice: { ParamInfoPtr info = *p; PyObject* arg = PyTuple_GET_ITEM(args, info->pos); - if(arg != Unset && os->writeOptional(info->tag, info->type->optionalFormat())) + if(arg != Unset && os->writeOpt(info->tag, info->type->optionalFormat())) { info->type->marshal(arg, os, &objectMap, true, &info->metaData); } @@ -1632,17 +1622,17 @@ IcePy::TypedInvocation::unmarshalResults(const pair<const Ice::Byte*, const Ice: PyObjectHandle results = PyTuple_New(numResults); if(results.get() && numResults > 0) { - Ice::InputStreamPtr is = Ice::wrapInputStream(_communicator, bytes); + Ice::InputStream is(_communicator, bytes); // - // Store a pointer to a local SlicedDataUtil object as the stream's closure. + // Store a pointer to a local StreamUtil object as the stream's closure. // This is necessary to support object unmarshaling (see ObjectReader). // - SlicedDataUtil util; - assert(!is->closure()); - is->closure(&util); + StreamUtil util; + assert(!is.getClosure()); + is.setClosure(&util); - is->startEncapsulation(); + is.startEncapsulation(); ParamInfoList::iterator p; @@ -1655,7 +1645,7 @@ IcePy::TypedInvocation::unmarshalResults(const pair<const Ice::Byte*, const Ice: if(!info->optional) { void* closure = reinterpret_cast<void*>(info->pos); - info->type->unmarshal(is, info, results.get(), closure, false, &info->metaData); + info->type->unmarshal(&is, info, results.get(), closure, false, &info->metaData); } } @@ -1666,7 +1656,7 @@ IcePy::TypedInvocation::unmarshalResults(const pair<const Ice::Byte*, const Ice: { assert(_op->returnType->pos == 0); void* closure = reinterpret_cast<void*>(_op->returnType->pos); - _op->returnType->type->unmarshal(is, _op->returnType, results.get(), closure, false, &_op->metaData); + _op->returnType->type->unmarshal(&is, _op->returnType, results.get(), closure, false, &_op->metaData); } // @@ -1675,10 +1665,10 @@ IcePy::TypedInvocation::unmarshalResults(const pair<const Ice::Byte*, const Ice: for(p = _op->optionalOutParams.begin(); p != _op->optionalOutParams.end(); ++p) { ParamInfoPtr info = *p; - if(is->readOptional(info->tag, info->type->optionalFormat())) + if(is.readOpt(info->tag, info->type->optionalFormat())) { void* closure = reinterpret_cast<void*>(info->pos); - info->type->unmarshal(is, info, results.get(), closure, true, &info->metaData); + info->type->unmarshal(&is, info, results.get(), closure, true, &info->metaData); } else { @@ -1692,12 +1682,12 @@ IcePy::TypedInvocation::unmarshalResults(const pair<const Ice::Byte*, const Ice: if(_op->returnsClasses) { - is->readPendingObjects(); + is.readPendingObjects(); } - is->endEncapsulation(); + is.endEncapsulation(); - util.update(); + util.updateSlicedData(); } return results.release(); @@ -1706,37 +1696,37 @@ IcePy::TypedInvocation::unmarshalResults(const pair<const Ice::Byte*, const Ice: PyObject* IcePy::TypedInvocation::unmarshalException(const pair<const Ice::Byte*, const Ice::Byte*>& bytes) { - Ice::InputStreamPtr is = Ice::wrapInputStream(_communicator, bytes); + Ice::InputStream is(_communicator, bytes); // - // Store a pointer to a local SlicedDataUtil object as the stream's closure. + // Store a pointer to a local StreamUtil object as the stream's closure. // This is necessary to support object unmarshaling (see ObjectReader). // - SlicedDataUtil util; - assert(!is->closure()); - is->closure(&util); + StreamUtil util; + assert(!is.getClosure()); + is.setClosure(&util); - is->startEncapsulation(); + is.startEncapsulation(); try { - Ice::UserExceptionReaderFactoryPtr factory = new UserExceptionReaderFactoryI(_communicator); - is->throwException(factory); + Ice::UserExceptionFactoryPtr factory = new UserExceptionFactory; + is.throwException(factory); } catch(const ExceptionReader& r) { - is->endEncapsulation(); + is.endEncapsulation(); PyObject* ex = r.getException(); if(validateException(ex)) { - util.update(); + util.updateSlicedData(); Ice::SlicedDataPtr slicedData = r.getSlicedData(); if(slicedData) { - SlicedDataUtil::setMember(ex, slicedData); + StreamUtil::setSlicedDataMember(ex, slicedData); } Py_INCREF(ex); @@ -1800,9 +1790,9 @@ IcePy::SyncTypedInvocation::invoke(PyObject* args, PyObject* /* kwds */) // // Marshal the input parameters to a byte sequence. // - Ice::OutputStreamPtr os; + Ice::OutputStream os(_communicator); pair<const Ice::Byte*, const Ice::Byte*> params; - if(!prepareRequest(pyparams, SyncMapping, os, params)) + if(!prepareRequest(pyparams, SyncMapping, &os, params)) { return 0; } @@ -2004,9 +1994,9 @@ IcePy::AsyncTypedInvocation::invoke(PyObject* args, PyObject* /* kwds */) // // Marshal the input parameters to a byte sequence. // - Ice::OutputStreamPtr os; + Ice::OutputStream os(_communicator); pair<const Ice::Byte*, const Ice::Byte*> params; - if(!prepareRequest(pyparams, AsyncMapping, os, params)) + if(!prepareRequest(pyparams, AsyncMapping, &os, params)) { return 0; } @@ -2289,9 +2279,9 @@ IcePy::OldAsyncTypedInvocation::invoke(PyObject* args, PyObject* /* kwds */) // // Marshal the input parameters to a byte sequence. // - Ice::OutputStreamPtr os; + Ice::OutputStream os(_communicator); pair<const Ice::Byte*, const Ice::Byte*> params; - if(!prepareRequest(pyparams, OldAsyncMapping, os, params)) + if(!prepareRequest(pyparams, OldAsyncMapping, &os, params)) { return 0; } @@ -3246,19 +3236,19 @@ IcePy::TypedUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, con if(!_op->inParams.empty()) { - Ice::InputStreamPtr is = Ice::wrapInputStream(_communicator, inBytes); + Ice::InputStream is(_communicator, inBytes); // - // Store a pointer to a local SlicedDataUtil object as the stream's closure. + // Store a pointer to a local StreamUtil object as the stream's closure. // This is necessary to support object unmarshaling (see ObjectReader). // - SlicedDataUtil util; - assert(!is->closure()); - is->closure(&util); + StreamUtil util; + assert(!is.getClosure()); + is.setClosure(&util); try { - is->startEncapsulation(); + is.startEncapsulation(); ParamInfoList::iterator p; @@ -3271,7 +3261,7 @@ IcePy::TypedUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, con if(!info->optional) { void* closure = reinterpret_cast<void*>(info->pos + offset); - info->type->unmarshal(is, info, args.get(), closure, false, &info->metaData); + info->type->unmarshal(&is, info, args.get(), closure, false, &info->metaData); } } @@ -3281,10 +3271,10 @@ IcePy::TypedUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, con for(p = _op->optionalInParams.begin(); p != _op->optionalInParams.end(); ++p) { ParamInfoPtr info = *p; - if(is->readOptional(info->tag, info->type->optionalFormat())) + if(is.readOpt(info->tag, info->type->optionalFormat())) { void* closure = reinterpret_cast<void*>(info->pos + offset); - info->type->unmarshal(is, info, args.get(), closure, true, &info->metaData); + info->type->unmarshal(&is, info, args.get(), closure, true, &info->metaData); } else { @@ -3298,12 +3288,12 @@ IcePy::TypedUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, con if(_op->sendsClasses) { - is->readPendingObjects(); + is.readPendingObjects(); } - is->endEncapsulation(); + is.endEncapsulation(); - util.update(); + util.updateSlicedData(); } catch(const AbortMarshaling&) { @@ -3394,7 +3384,7 @@ IcePy::TypedUpcall::response(PyObject* args, const Ice::EncodingVersion& encodin // Marshal the results. If there is more than one value to be returned, then they must be // returned in a tuple of the form (result, outParam1, ...). // - Ice::OutputStreamPtr os = Ice::createOutputStream(_communicator); + Ice::OutputStream os(_communicator); try { Py_ssize_t numResults = static_cast<Py_ssize_t>(_op->outParams.size()); @@ -3433,7 +3423,7 @@ IcePy::TypedUpcall::response(PyObject* args, const Ice::EncodingVersion& encodin } Py_INCREF(args); - os->startEncapsulation(encoding, _op->format); + os.startEncapsulation(encoding, _op->format); ObjectMap objectMap; ParamInfoList::iterator p; @@ -3478,7 +3468,7 @@ IcePy::TypedUpcall::response(PyObject* args, const Ice::EncodingVersion& encodin if(!info->optional) { PyObject* arg = PyTuple_GET_ITEM(t.get(), info->pos); - info->type->marshal(arg, os, &objectMap, false, &info->metaData); + info->type->marshal(arg, &os, &objectMap, false, &info->metaData); } } @@ -3488,7 +3478,7 @@ IcePy::TypedUpcall::response(PyObject* args, const Ice::EncodingVersion& encodin if(_op->returnType && !_op->returnType->optional) { PyObject* res = PyTuple_GET_ITEM(t.get(), 0); - _op->returnType->type->marshal(res, os, &objectMap, false, &_op->metaData); + _op->returnType->type->marshal(res, &os, &objectMap, false, &_op->metaData); } // @@ -3498,21 +3488,21 @@ IcePy::TypedUpcall::response(PyObject* args, const Ice::EncodingVersion& encodin { ParamInfoPtr info = *p; PyObject* arg = PyTuple_GET_ITEM(t.get(), info->pos); - if(arg != Unset && os->writeOptional(info->tag, info->type->optionalFormat())) + if(arg != Unset && os.writeOpt(info->tag, info->type->optionalFormat())) { - info->type->marshal(arg, os, &objectMap, true, &info->metaData); + info->type->marshal(arg, &os, &objectMap, true, &info->metaData); } } if(_op->returnsClasses) { - os->writePendingObjects(); + os.writePendingObjects(); } - os->endEncapsulation(); + os.endEncapsulation(); AllowThreads allowThreads; // Release Python's global interpreter lock during blocking calls. - _callback->ice_response(true, os->finished()); + _callback->ice_response(true, os.finished()); } catch(const AbortMarshaling&) { @@ -3569,16 +3559,16 @@ IcePy::TypedUpcall::exception(PyException& ex, const Ice::EncodingVersion& encod } else { - Ice::OutputStreamPtr os = Ice::createOutputStream(_communicator); - os->startEncapsulation(encoding, _op->format); + Ice::OutputStream os(_communicator); + os.startEncapsulation(encoding, _op->format); - ExceptionWriter writer(_communicator, ex.ex, info); - os->writeException(writer); + ExceptionWriter writer(ex.ex, info); + os.writeException(writer); - os->endEncapsulation(); + os.endEncapsulation(); AllowThreads allowThreads; // Release Python's global interpreter lock during blocking calls. - _callback->ice_response(false, os->finished()); + _callback->ice_response(false, os.finished()); } } else diff --git a/python/modules/IcePy/Proxy.cpp b/python/modules/IcePy/Proxy.cpp index 293c3c16de8..adca91b26ab 100644 --- a/python/modules/IcePy/Proxy.cpp +++ b/python/modules/IcePy/Proxy.cpp @@ -145,9 +145,7 @@ proxyCompare(ProxyObject* p1, PyObject* other, int op) } } - PyObject* r = result ? getTrue() : getFalse(); - Py_INCREF(r); - return r; + return result ? incTrue() : incFalse(); } #ifdef WIN32 diff --git a/python/modules/IcePy/Types.cpp b/python/modules/IcePy/Types.cpp index f994ce46e80..b7aa87a8204 100644 --- a/python/modules/IcePy/Types.cpp +++ b/python/modules/IcePy/Types.cpp @@ -17,7 +17,9 @@ #include <Util.h> #include <IceUtil/InputUtil.h> #include <IceUtil/ScopedArray.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> +#include <Ice/OutputStream.h> #include <Ice/SlicedData.h> #include <list> @@ -51,23 +53,6 @@ public: }; static InfoMapDestroyer infoMapDestroyer; -class ReadObjectCallback : public Ice::ReadObjectCallback -{ -public: - - ReadObjectCallback(const ClassInfoPtr&, const UnmarshalCallbackPtr&, PyObject*, void*); - ~ReadObjectCallback(); - - virtual void invoke(const ::Ice::ObjectPtr&); - -private: - - ClassInfoPtr _info; - UnmarshalCallbackPtr _cb; - PyObject* _target; - void* _closure; -}; - struct TypeInfoObject { PyObject_HEAD @@ -84,7 +69,7 @@ extern PyTypeObject TypeInfoType; extern PyTypeObject ExceptionInfoType; bool -writeString(PyObject* p, const Ice::OutputStreamPtr& os) +writeString(PyObject* p, Ice::OutputStream* os) { if(p == Py_None) { @@ -273,16 +258,16 @@ addExceptionInfo(const string& id, const ExceptionInfoPtr& info) } // -// SlicedDataUtil implementation +// StreamUtil implementation // -PyObject* IcePy::SlicedDataUtil::_slicedDataType = 0; -PyObject* IcePy::SlicedDataUtil::_sliceInfoType = 0; +PyObject* IcePy::StreamUtil::_slicedDataType = 0; +PyObject* IcePy::StreamUtil::_sliceInfoType = 0; -IcePy::SlicedDataUtil::SlicedDataUtil() +IcePy::StreamUtil::StreamUtil() { } -IcePy::SlicedDataUtil::~SlicedDataUtil() +IcePy::StreamUtil::~StreamUtil() { // // Make sure we break any cycles among the ObjectReaders in preserved slices. @@ -305,23 +290,29 @@ IcePy::SlicedDataUtil::~SlicedDataUtil() } void -IcePy::SlicedDataUtil::add(const ObjectReaderPtr& reader) +IcePy::StreamUtil::add(const ReadObjectCallbackPtr& callback) +{ + _callbacks.push_back(callback); +} + +void +IcePy::StreamUtil::add(const ObjectReaderPtr& reader) { assert(reader->getSlicedData()); _readers.insert(reader); } void -IcePy::SlicedDataUtil::update() +IcePy::StreamUtil::updateSlicedData() { for(set<ObjectReaderPtr>::iterator p = _readers.begin(); p != _readers.end(); ++p) { - setMember((*p)->getObject(), (*p)->getSlicedData()); + setSlicedDataMember((*p)->getObject(), (*p)->getSlicedData()); } } void -IcePy::SlicedDataUtil::setMember(PyObject* obj, const Ice::SlicedDataPtr& slicedData) +IcePy::StreamUtil::setSlicedDataMember(PyObject* obj, const Ice::SlicedDataPtr& slicedData) { // // Create a Python equivalent of the SlicedData object. @@ -487,7 +478,7 @@ IcePy::SlicedDataUtil::setMember(PyObject* obj, const Ice::SlicedDataPtr& sliced // named _ice_slicedData which is an instance of the Python class Ice.SlicedData. // Ice::SlicedDataPtr -IcePy::SlicedDataUtil::getMember(PyObject* obj, ObjectMap* objectMap) +IcePy::StreamUtil::getSlicedDataMember(PyObject* obj, ObjectMap* objectMap) { Ice::SlicedDataPtr slicedData; @@ -832,7 +823,7 @@ IcePy::PrimitiveInfo::optionalFormat() const } void -IcePy::PrimitiveInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMap*, bool, const Ice::StringSeq*) +IcePy::PrimitiveInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap*, bool, const Ice::StringSeq*) { switch(kind) { @@ -912,7 +903,7 @@ IcePy::PrimitiveInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, Objec } void -IcePy::PrimitiveInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, PyObject* target, +IcePy::PrimitiveInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, PyObject* target, void* closure, bool, const Ice::StringSeq*) { switch(kind) @@ -1073,7 +1064,7 @@ IcePy::EnumInfo::optionalFormat() const } void -IcePy::EnumInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMap*, bool optional, const Ice::StringSeq*) +IcePy::EnumInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap*, bool optional, const Ice::StringSeq*) { // // Validate value. @@ -1089,7 +1080,7 @@ IcePy::EnumInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMap* } void -IcePy::EnumInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, PyObject* target, +IcePy::EnumInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, PyObject* target, void* closure, bool, const Ice::StringSeq*) { Ice::Int val = is->readEnum(maxValue); @@ -1327,7 +1318,7 @@ IcePy::StructInfo::usesClasses() const } void -IcePy::StructInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMap* objectMap, bool optional, +IcePy::StructInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap* objectMap, bool optional, const Ice::StringSeq*) { assert(p == Py_None || PyObject_IsInstance(p, pythonType.get()) == 1); // validate() should have caught this. @@ -1384,7 +1375,7 @@ IcePy::StructInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMa } void -IcePy::StructInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, PyObject* target, +IcePy::StructInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, PyObject* target, void* closure, bool optional, const Ice::StringSeq*) { PyObjectHandle p = instantiate(pythonType.get()); @@ -1528,7 +1519,7 @@ IcePy::SequenceInfo::usesClasses() const } void -IcePy::SequenceInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMap* objectMap, bool optional, +IcePy::SequenceInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap* objectMap, bool optional, const Ice::StringSeq* metaData) { PrimitiveInfoPtr pi = PrimitiveInfoPtr::dynamicCast(elementType); @@ -1627,7 +1618,7 @@ IcePy::SequenceInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, Object } void -IcePy::SequenceInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, PyObject* target, +IcePy::SequenceInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, PyObject* target, void* closure, bool optional, const Ice::StringSeq* metaData) { if(optional) @@ -1772,7 +1763,7 @@ IcePy::SequenceInfo::getSequence(const PrimitiveInfoPtr& pi, PyObject* p) } void -IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObject* p, const Ice::OutputStreamPtr& os) +IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObject* p, Ice::OutputStream* os) { // // For most types, we accept an object that implements the buffer protocol @@ -2075,7 +2066,7 @@ IcePy::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, PyObje } void -IcePy::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, const Ice::InputStreamPtr& is, +IcePy::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, Ice::InputStream* is, const UnmarshalCallbackPtr& cb, PyObject* target, void* closure, const SequenceMappingPtr& sm) { @@ -2429,7 +2420,7 @@ IcePy::CustomInfo::usesClasses() const } void -IcePy::CustomInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMap* objectMap, bool, +IcePy::CustomInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap* objectMap, bool, const Ice::StringSeq* metaData) { assert(PyObject_IsInstance(p, pythonType.get()) == 1); // validate() should have caught this. @@ -2464,7 +2455,7 @@ IcePy::CustomInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMa } void -IcePy::CustomInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, PyObject* target, +IcePy::CustomInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, PyObject* target, void* closure, bool, const Ice::StringSeq* metaData) { // @@ -2601,7 +2592,7 @@ IcePy::DictionaryInfo::usesClasses() const } void -IcePy::DictionaryInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMap* objectMap, bool optional, +IcePy::DictionaryInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap* objectMap, bool optional, const Ice::StringSeq*) { if(p != Py_None && !PyDict_Check(p)) @@ -2661,7 +2652,7 @@ IcePy::DictionaryInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, Obje } void -IcePy::DictionaryInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, PyObject* target, +IcePy::DictionaryInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, PyObject* target, void* closure, bool optional, const Ice::StringSeq*) { if(optional) @@ -2871,7 +2862,7 @@ IcePy::ClassInfo::usesClasses() const } void -IcePy::ClassInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMap* objectMap, bool, +IcePy::ClassInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap* objectMap, bool, const Ice::StringSeq*) { if(!pythonType.get()) @@ -2882,7 +2873,8 @@ IcePy::ClassInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMap if(p == Py_None) { - os->writeObject(0); + Ice::ObjectPtr nil; + os->write(nil); return; } @@ -2914,11 +2906,24 @@ IcePy::ClassInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMap // // Give the writer to the stream. The stream will eventually call write() on it. // - os->writeObject(writer); + os->write(writer); +} + +namespace +{ + +void +patchObject(void* addr, const Ice::ObjectPtr& v) +{ + ReadObjectCallback* cb = static_cast<ReadObjectCallback*>(addr); + assert(cb); + cb->invoke(v); +} + } void -IcePy::ClassInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, PyObject* target, +IcePy::ClassInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, PyObject* target, void* closure, bool, const Ice::StringSeq*) { if(!pythonType.get()) @@ -2927,7 +2932,16 @@ IcePy::ClassInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallba throw AbortMarshaling(); } - is->readObject(new ReadObjectCallback(this, cb, target, closure)); + // + // This callback is notified when the Slice value is actually read. The StreamUtil object + // attached to the stream keeps a reference to the callback object to ensure it lives + // long enough. + // + ReadObjectCallbackPtr rocb = new ReadObjectCallback(this, cb, target, closure); + StreamUtil* util = reinterpret_cast<StreamUtil*>(is->getClosure()); + assert(util); + util->add(rocb); + is->read(patchObject, rocb.get()); } void @@ -3089,7 +3103,7 @@ IcePy::ProxyInfo::optionalFormat() const } void -IcePy::ProxyInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMap*, bool optional, const Ice::StringSeq*) +IcePy::ProxyInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap*, bool optional, const Ice::StringSeq*) { Ice::OutputStream::size_type sizePos = 0; if(optional) @@ -3117,7 +3131,7 @@ IcePy::ProxyInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMap } void -IcePy::ProxyInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, PyObject* target, +IcePy::ProxyInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, PyObject* target, void* closure, bool optional, const Ice::StringSeq*) { if(optional) @@ -3140,7 +3154,7 @@ IcePy::ProxyInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallba throw AbortMarshaling(); } - PyObjectHandle p = createProxy(proxy, is->communicator(), pythonType.get()); + PyObjectHandle p = createProxy(proxy, proxy->ice_getCommunicator(), pythonType.get()); cb->unmarshaled(p.get(), target, closure); } @@ -3213,7 +3227,7 @@ IcePy::ObjectWriter::ice_preMarshal() } void -IcePy::ObjectWriter::write(const Ice::OutputStreamPtr& os) const +IcePy::ObjectWriter::__write(Ice::OutputStream* os) const { Ice::SlicedDataPtr slicedData; @@ -3222,7 +3236,7 @@ IcePy::ObjectWriter::write(const Ice::OutputStreamPtr& os) const // // Retrieve the SlicedData object that we stored as a hidden member of the Python object. // - slicedData = SlicedDataUtil::getMember(_object, const_cast<ObjectMap*>(_map)); + slicedData = StreamUtil::getSlicedDataMember(_object, const_cast<ObjectMap*>(_map)); } os->startObject(slicedData); @@ -3247,7 +3261,13 @@ IcePy::ObjectWriter::write(const Ice::OutputStreamPtr& os) const } void -IcePy::ObjectWriter::writeMembers(const Ice::OutputStreamPtr& os, const DataMemberList& members) const +IcePy::ObjectWriter::__read(Ice::InputStream*) +{ + assert(false); +} + +void +IcePy::ObjectWriter::writeMembers(Ice::OutputStream* os, const DataMemberList& members) const { for(DataMemberList::const_iterator q = members.begin(); q != members.end(); ++q) { @@ -3271,7 +3291,7 @@ IcePy::ObjectWriter::writeMembers(const Ice::OutputStreamPtr& os, const DataMemb } } else if(member->optional && - (val.get() == Unset || !os->writeOptional(member->tag, member->type->optionalFormat()))) + (val.get() == Unset || !os->writeOpt(member->tag, member->type->optionalFormat()))) { continue; } @@ -3316,7 +3336,13 @@ IcePy::ObjectReader::ice_postUnmarshal() } void -IcePy::ObjectReader::read(const Ice::InputStreamPtr& is) +IcePy::ObjectReader::__write(Ice::OutputStream*) const +{ + assert(false); +} + +void +IcePy::ObjectReader::__read(Ice::InputStream* is) { is->startObject(); @@ -3346,7 +3372,7 @@ IcePy::ObjectReader::read(const Ice::InputStreamPtr& is) for(p = info->optionalMembers.begin(); p != info->optionalMembers.end(); ++p) { DataMemberPtr member = *p; - if(is->readOptional(member->tag, member->type->optionalFormat())) + if(is->readOpt(member->tag, member->type->optionalFormat())) { member->type->unmarshal(is, member, _object, 0, true, &member->metaData); } @@ -3367,7 +3393,7 @@ IcePy::ObjectReader::read(const Ice::InputStreamPtr& is) if(_slicedData) { - SlicedDataUtil* util = reinterpret_cast<SlicedDataUtil*>(is->closure()); + StreamUtil* util = reinterpret_cast<StreamUtil*>(is->getClosure()); assert(util); util->add(this); @@ -3475,7 +3501,7 @@ IcePy::ReadObjectCallback::invoke(const Ice::ObjectPtr& p) // ExceptionInfo implementation. // void -IcePy::ExceptionInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, ObjectMap* objectMap) +IcePy::ExceptionInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap* objectMap) { if(!PyObject_IsInstance(p, pythonType.get())) { @@ -3490,7 +3516,7 @@ IcePy::ExceptionInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, Objec // // Retrieve the SlicedData object that we stored as a hidden member of the Python object. // - slicedData = SlicedDataUtil::getMember(p, objectMap); + slicedData = StreamUtil::getSlicedDataMember(p, objectMap); } os->startException(slicedData); @@ -3512,7 +3538,7 @@ IcePy::ExceptionInfo::marshal(PyObject* p, const Ice::OutputStreamPtr& os, Objec } void -IcePy::ExceptionInfo::writeMembers(PyObject* p, const Ice::OutputStreamPtr& os, const DataMemberList& members, +IcePy::ExceptionInfo::writeMembers(PyObject* p, Ice::OutputStream* os, const DataMemberList& members, ObjectMap* objectMap) const { for(DataMemberList::const_iterator q = members.begin(); q != members.end(); ++q) @@ -3537,7 +3563,7 @@ IcePy::ExceptionInfo::writeMembers(PyObject* p, const Ice::OutputStreamPtr& os, } } else if(member->optional && - (val.get() == Unset || !os->writeOptional(member->tag, member->type->optionalFormat()))) + (val.get() == Unset || !os->writeOpt(member->tag, member->type->optionalFormat()))) { continue; } @@ -3554,7 +3580,7 @@ IcePy::ExceptionInfo::writeMembers(PyObject* p, const Ice::OutputStreamPtr& os, } PyObject* -IcePy::ExceptionInfo::unmarshal(const Ice::InputStreamPtr& is) +IcePy::ExceptionInfo::unmarshal(Ice::InputStream* is) { PyObjectHandle p = createExceptionInstance(pythonType.get()); @@ -3577,7 +3603,7 @@ IcePy::ExceptionInfo::unmarshal(const Ice::InputStreamPtr& is) for(q = info->optionalMembers.begin(); q != info->optionalMembers.end(); ++q) { DataMemberPtr member = *q; - if(is->readOptional(member->tag, member->type->optionalFormat())) + if(is->readOpt(member->tag, member->type->optionalFormat())) { member->type->unmarshal(is, member, p.get(), 0, true, &member->metaData); } @@ -3664,9 +3690,8 @@ IcePy::ExceptionInfo::printMembers(PyObject* value, IceUtilInternal::Output& out // // ExceptionWriter implementation. // -IcePy::ExceptionWriter::ExceptionWriter(const Ice::CommunicatorPtr& communicator, const PyObjectHandle& ex, - const ExceptionInfoPtr& info) : - Ice::UserExceptionWriter(communicator), _ex(ex), _info(info) +IcePy::ExceptionWriter::ExceptionWriter(const PyObjectHandle& ex, const ExceptionInfoPtr& info) : + _ex(ex), _info(info) { if(!info) { @@ -3684,20 +3709,6 @@ IcePy::ExceptionWriter::~ExceptionWriter() throw() _ex = 0; } -void -IcePy::ExceptionWriter::write(const Ice::OutputStreamPtr& os) const -{ - AdoptThread adoptThread; // Ensure the current thread is able to call into Python. - - _info->marshal(_ex.get(), os, const_cast<ObjectMap*>(&_objects)); -} - -bool -IcePy::ExceptionWriter::usesClasses() const -{ - return _info->usesClasses; -} - string IcePy::ExceptionWriter::ice_id() const { @@ -3724,39 +3735,40 @@ IcePy::ExceptionWriter::ice_throw() const throw *this; } -// -// ExceptionReader implementation. -// -IcePy::ExceptionReader::ExceptionReader(const Ice::CommunicatorPtr& communicator, const ExceptionInfoPtr& info) : - Ice::UserExceptionReader(communicator), _info(info) -{ -} - -IcePy::ExceptionReader::~ExceptionReader() throw() +void +IcePy::ExceptionWriter::__write(Ice::OutputStream* os) const { AdoptThread adoptThread; // Ensure the current thread is able to call into Python. - _ex = 0; + _info->marshal(_ex.get(), os, const_cast<ObjectMap*>(&_objects)); } void -IcePy::ExceptionReader::read(const Ice::InputStreamPtr& is) const +IcePy::ExceptionWriter::__read(Ice::InputStream*) { - AdoptThread adoptThread; // Ensure the current thread is able to call into Python. - - is->startException(); - - const_cast<PyObjectHandle&>(_ex) = _info->unmarshal(is); - - const_cast<Ice::SlicedDataPtr&>(_slicedData) = is->endException(_info->preserve); } bool -IcePy::ExceptionReader::usesClasses() const +IcePy::ExceptionWriter::__usesClasses() const { return _info->usesClasses; } +// +// ExceptionReader implementation. +// +IcePy::ExceptionReader::ExceptionReader(const ExceptionInfoPtr& info) : + _info(info) +{ +} + +IcePy::ExceptionReader::~ExceptionReader() throw() +{ + AdoptThread adoptThread; // Ensure the current thread is able to call into Python. + + _ex = 0; +} + string IcePy::ExceptionReader::ice_id() const { @@ -3784,6 +3796,30 @@ IcePy::ExceptionReader::ice_throw() const throw *this; } +void +IcePy::ExceptionReader::__write(Ice::OutputStream*) const +{ + assert(false); +} + +void +IcePy::ExceptionReader::__read(Ice::InputStream* is) +{ + AdoptThread adoptThread; // Ensure the current thread is able to call into Python. + + is->startException(); + + const_cast<PyObjectHandle&>(_ex) = _info->unmarshal(is); + + const_cast<Ice::SlicedDataPtr&>(_slicedData) = is->endException(_info->preserve); +} + +bool +IcePy::ExceptionReader::__usesClasses() const +{ + return _info->usesClasses; +} + PyObject* IcePy::ExceptionReader::getException() const { diff --git a/python/modules/IcePy/Types.h b/python/modules/IcePy/Types.h index e2eee69e3a9..e67542f9195 100644 --- a/python/modules/IcePy/Types.h +++ b/python/modules/IcePy/Types.h @@ -12,7 +12,9 @@ #include <Config.h> #include <Util.h> -#include <Ice/Stream.h> +#include <Ice/FactoryTable.h> +#include <Ice/Object.h> +#include <Ice/SlicedDataF.h> #include <IceUtil/OutputUtil.h> #include <set> @@ -41,37 +43,6 @@ class ObjectReader; typedef IceUtil::Handle<ObjectReader> ObjectReaderPtr; // -// This class keeps track of Python objects (instances of Slice classes -// and exceptions) that have preserved slices. -// -class SlicedDataUtil -{ -public: - - SlicedDataUtil(); - ~SlicedDataUtil(); - - void add(const ObjectReaderPtr&); - - void update(); - - static void setMember(PyObject*, const Ice::SlicedDataPtr&); - static Ice::SlicedDataPtr getMember(PyObject*, ObjectMap*); - -private: - - std::set<ObjectReaderPtr> _readers; - static PyObject* _slicedDataType; - static PyObject* _sliceInfoType; -}; - -struct PrintObjectHistory -{ - int index; - std::map<PyObject*, int> objects; -}; - -// // The delayed nature of class unmarshaling in the Ice protocol requires us to // handle unmarshaling using a callback strategy. An instance of UnmarshalCallback // is supplied to each type's unmarshal() member function. For all types except @@ -95,6 +66,71 @@ public: typedef IceUtil::Handle<UnmarshalCallback> UnmarshalCallbackPtr; // +// ReadObjectCallback retains all of the information necessary to store an unmarshaled +// Slice value as a Python object. +// +class ReadObjectCallback : public IceUtil::Shared +{ +public: + + ReadObjectCallback(const ClassInfoPtr&, const UnmarshalCallbackPtr&, PyObject*, void*); + ~ReadObjectCallback(); + + void invoke(const ::Ice::ObjectPtr&); + +private: + + ClassInfoPtr _info; + UnmarshalCallbackPtr _cb; + PyObject* _target; + void* _closure; +}; +typedef IceUtil::Handle<ReadObjectCallback> ReadObjectCallbackPtr; + +// +// This class assists during unmarshaling of Slice classes and exceptions. +// We attach an instance to a stream. +// +class StreamUtil +{ +public: + + StreamUtil(); + ~StreamUtil(); + + // + // Keep a reference to a ReadObjectCallback for patching purposes. + // + void add(const ReadObjectCallbackPtr&); + + // + // Keep track of object instances that have preserved slices. + // + void add(const ObjectReaderPtr&); + + // + // Updated the sliced data information for all stored object instances. + // + void updateSlicedData(); + + static void setSlicedDataMember(PyObject*, const Ice::SlicedDataPtr&); + static Ice::SlicedDataPtr getSlicedDataMember(PyObject*, ObjectMap*); + +private: + + std::vector<ReadObjectCallbackPtr> _callbacks; + std::set<ObjectReaderPtr> _readers; + static PyObject* _slicedDataType; + static PyObject* _sliceInfoType; +}; + +struct PrintObjectHistory +{ + int index; + std::map<PyObject*, int> objects; +}; + +// // Base class for type information. // class TypeInfo : public UnmarshalCallback @@ -125,8 +161,8 @@ public: // The marshal and unmarshal functions can raise Ice exceptions, and may raise // AbortMarshaling if an error occurs. // - virtual void marshal(PyObject*, const Ice::OutputStreamPtr&, ObjectMap*, bool, const Ice::StringSeq* = 0) = 0; - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, + virtual void marshal(PyObject*, Ice::OutputStream*, ObjectMap*, bool, const Ice::StringSeq* = 0) = 0; + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0) = 0; virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*) = 0; @@ -162,8 +198,8 @@ public: virtual int wireSize() const; virtual Ice::OptionalFormat optionalFormat() const; - virtual void marshal(PyObject*, const Ice::OutputStreamPtr&, ObjectMap*, bool, const Ice::StringSeq* = 0); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, + virtual void marshal(PyObject*, Ice::OutputStream*, ObjectMap*, bool, const Ice::StringSeq* = 0); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); @@ -191,8 +227,8 @@ public: virtual int wireSize() const; virtual Ice::OptionalFormat optionalFormat() const; - virtual void marshal(PyObject*, const Ice::OutputStreamPtr&, ObjectMap*, bool, const Ice::StringSeq* = 0); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, + virtual void marshal(PyObject*, Ice::OutputStream*, ObjectMap*, bool, const Ice::StringSeq* = 0); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); @@ -241,8 +277,8 @@ public: virtual bool usesClasses() const; - virtual void marshal(PyObject*, const Ice::OutputStreamPtr&, ObjectMap*, bool, const Ice::StringSeq* = 0); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, + virtual void marshal(PyObject*, Ice::OutputStream*, ObjectMap*, bool, const Ice::StringSeq* = 0); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); @@ -282,8 +318,8 @@ public: virtual bool usesClasses() const; - virtual void marshal(PyObject*, const Ice::OutputStreamPtr&, ObjectMap*, bool, const Ice::StringSeq* = 0); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, + virtual void marshal(PyObject*, Ice::OutputStream*, ObjectMap*, bool, const Ice::StringSeq* = 0); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); @@ -311,8 +347,8 @@ private: typedef IceUtil::Handle<SequenceMapping> SequenceMappingPtr; PyObject* getSequence(const PrimitiveInfoPtr&, PyObject*); - void marshalPrimitiveSequence(const PrimitiveInfoPtr&, PyObject*, const Ice::OutputStreamPtr&); - void unmarshalPrimitiveSequence(const PrimitiveInfoPtr&, const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, + void marshalPrimitiveSequence(const PrimitiveInfoPtr&, PyObject*, Ice::OutputStream*); + void unmarshalPrimitiveSequence(const PrimitiveInfoPtr&, Ice::InputStream*, const UnmarshalCallbackPtr&, PyObject*, void*, const SequenceMappingPtr&); public: @@ -342,8 +378,8 @@ public: virtual bool usesClasses() const; - virtual void marshal(PyObject*, const Ice::OutputStreamPtr&, ObjectMap*, bool, const Ice::StringSeq* = 0); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, + virtual void marshal(PyObject*, Ice::OutputStream*, ObjectMap*, bool, const Ice::StringSeq* = 0); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); @@ -374,8 +410,8 @@ public: virtual bool usesClasses() const; - virtual void marshal(PyObject*, const Ice::OutputStreamPtr&, ObjectMap*, bool, const Ice::StringSeq* = 0); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, + virtual void marshal(PyObject*, Ice::OutputStream*, ObjectMap*, bool, const Ice::StringSeq* = 0); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); virtual void unmarshaled(PyObject*, PyObject*, void*); @@ -424,8 +460,8 @@ public: virtual bool usesClasses() const; - virtual void marshal(PyObject*, const Ice::OutputStreamPtr&, ObjectMap*, bool, const Ice::StringSeq* = 0); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, + virtual void marshal(PyObject*, Ice::OutputStream*, ObjectMap*, bool, const Ice::StringSeq* = 0); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); @@ -466,8 +502,8 @@ public: virtual int wireSize() const; virtual Ice::OptionalFormat optionalFormat() const; - virtual void marshal(PyObject*, const Ice::OutputStreamPtr&, ObjectMap*, bool, const Ice::StringSeq* = 0); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, + virtual void marshal(PyObject*, Ice::OutputStream*, ObjectMap*, bool, const Ice::StringSeq* = 0); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); @@ -487,8 +523,8 @@ class ExceptionInfo : public IceUtil::Shared { public: - void marshal(PyObject*, const Ice::OutputStreamPtr&, ObjectMap*); - PyObject* unmarshal(const Ice::InputStreamPtr&); + void marshal(PyObject*, Ice::OutputStream*, ObjectMap*); + PyObject* unmarshal(Ice::InputStream*); void print(PyObject*, IceUtilInternal::Output&); void printMembers(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); @@ -503,13 +539,13 @@ public: private: - void writeMembers(PyObject*, const Ice::OutputStreamPtr&, const DataMemberList&, ObjectMap*) const; + void writeMembers(PyObject*, Ice::OutputStream*, const DataMemberList&, ObjectMap*) const; }; // // ObjectWriter wraps a Python object for marshaling. // -class ObjectWriter : public Ice::ObjectWriter +class ObjectWriter : public Ice::Object { public: @@ -518,11 +554,12 @@ public: virtual void ice_preMarshal(); - virtual void write(const Ice::OutputStreamPtr&) const; + virtual void __write(Ice::OutputStream*) const; + virtual void __read(Ice::InputStream*); private: - void writeMembers(const Ice::OutputStreamPtr&, const DataMemberList&) const; + void writeMembers(Ice::OutputStream*, const DataMemberList&) const; PyObject* _object; ObjectMap* _map; @@ -532,7 +569,7 @@ private: // // ObjectReader unmarshals the state of an Ice object. // -class ObjectReader : public Ice::ObjectReader +class ObjectReader : public Ice::Object { public: @@ -541,7 +578,8 @@ public: virtual void ice_postUnmarshal(); - virtual void read(const Ice::InputStreamPtr&); + virtual void __write(Ice::OutputStream*) const; + virtual void __read(Ice::InputStream*); virtual ClassInfoPtr getInfo() const; @@ -559,16 +597,13 @@ private: // // ExceptionWriter wraps a Python user exception for marshaling. // -class ExceptionWriter : public Ice::UserExceptionWriter +class ExceptionWriter : public Ice::UserException { public: - ExceptionWriter(const Ice::CommunicatorPtr&, const PyObjectHandle&, const ExceptionInfoPtr& = 0); + ExceptionWriter(const PyObjectHandle&, const ExceptionInfoPtr& = 0); ~ExceptionWriter() throw(); - virtual void write(const Ice::OutputStreamPtr&) const; - virtual bool usesClasses() const; - virtual std::string ice_id() const; #ifndef ICE_CPP11_MAPPING ICE_DEPRECATED_API("ice_name() is deprecated, use ice_id() instead.") @@ -577,6 +612,16 @@ public: virtual Ice::UserException* ice_clone() const; virtual void ice_throw() const; + virtual void __write(Ice::OutputStream*) const; + virtual void __read(Ice::InputStream*); + + virtual bool __usesClasses() const; + +protected: + + virtual void __writeImpl(Ice::OutputStream*) const {} + virtual void __readImpl(Ice::InputStream*) {} + private: PyObjectHandle _ex; @@ -587,16 +632,13 @@ private: // // ExceptionReader creates a Python user exception and unmarshals it. // -class ExceptionReader : public Ice::UserExceptionReader +class ExceptionReader : public Ice::UserException { public: - ExceptionReader(const Ice::CommunicatorPtr&, const ExceptionInfoPtr&); + ExceptionReader(const ExceptionInfoPtr&); ~ExceptionReader() throw(); - virtual void read(const Ice::InputStreamPtr&) const; - virtual bool usesClasses() const; - virtual std::string ice_id() const; #ifndef ICE_CPP11_MAPPING ICE_DEPRECATED_API("ice_name() is deprecated, use ice_id() instead.") @@ -605,10 +647,23 @@ public: virtual Ice::UserException* ice_clone() const; virtual void ice_throw() const; + virtual void __write(Ice::OutputStream*) const; + virtual void __read(Ice::InputStream*); + + virtual bool __usesClasses() const; + PyObject* getException() const; // Borrowed reference. Ice::SlicedDataPtr getSlicedData() const; + using Ice::UserException::__read; + using Ice::UserException::__write; + +protected: + + virtual void __writeImpl(Ice::OutputStream*) const {} + virtual void __readImpl(Ice::InputStream*) {} + private: ExceptionInfoPtr _info; diff --git a/python/modules/IcePy/Util.h b/python/modules/IcePy/Util.h index 5732a9d10df..c8e33a84313 100644 --- a/python/modules/IcePy/Util.h +++ b/python/modules/IcePy/Util.h @@ -16,7 +16,7 @@ #include <Ice/Exception.h> // -// These macros replace Py_RETURN_FALSE and Py_RETURN TRUE. We use these +// These macros replace Py_RETURN_FALSE and Py_RETURN_TRUE. We use these // instead of the standard ones in order to avoid GCC warnings about // strict aliasing and type punning. // diff --git a/python/modules/IcePy/ValueFactoryManager.cpp b/python/modules/IcePy/ValueFactoryManager.cpp new file mode 100644 index 00000000000..b3e2bd43513 --- /dev/null +++ b/python/modules/IcePy/ValueFactoryManager.cpp @@ -0,0 +1,536 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifdef _WIN32 +# include <IceUtil/Config.h> +#endif +#include <ValueFactoryManager.h> +#include <Thread.h> +#include <Types.h> +#include <Ice/LocalException.h> + +using namespace std; +using namespace IcePy; + +namespace IcePy +{ + +struct ValueFactoryManagerObject +{ + PyObject_HEAD + ValueFactoryManagerPtr* vfm; +}; + +} + +namespace +{ + +ClassInfoPtr +getClassInfo(const string& id) +{ + ClassInfoPtr info; + + if(id == Ice::Object::ice_staticId()) + { + // + // When the ID is that of Ice::Object, it indicates that the stream has not + // found a factory and is providing us an opportunity to preserve the object. + // + info = lookupClassInfo("::Ice::UnknownSlicedObject"); + } + else + { + info = lookupClassInfo(id); + } + + return info; +} + +} + +IcePy::ValueFactoryManager::ValueFactoryManager() +{ + // + // Create a Python wrapper around this object. Note that this is cyclic - we clear the + // reference in destroy(). + // + ValueFactoryManagerObject* obj = reinterpret_cast<ValueFactoryManagerObject*>( + ValueFactoryManagerType.tp_alloc(&ValueFactoryManagerType, 0)); + assert(obj); + obj->vfm = new ValueFactoryManagerPtr(this); + _self = reinterpret_cast<PyObject*>(obj); + + _defaultFactory = new DefaultValueFactory; +} + +IcePy::ValueFactoryManager::~ValueFactoryManager() +{ + AdoptThread adoptThread; // Ensure the current thread is able to call into Python. + Py_XDECREF(_self); +} + +void +IcePy::ValueFactoryManager::add(const Ice::ValueFactoryPtr& f, const string& id) +{ + Lock lock(*this); + + if(id.empty()) + { + if(_defaultFactory->getDelegate()) + { + throw Ice::AlreadyRegisteredException(__FILE__, __LINE__, "value factory", id); + } + + _defaultFactory->setDelegate(f); + } + else + { + FactoryMap::iterator p = _factories.find(id); + if(p != _factories.end()) + { + throw Ice::AlreadyRegisteredException(__FILE__, __LINE__, "value factory", id); + } + + _factories.insert(FactoryMap::value_type(id, f)); + } +} + +Ice::ValueFactoryPtr +IcePy::ValueFactoryManager::find(const string& id) const +{ + Lock lock(*this); + + if(id.empty()) + { + return _defaultFactory; + } + + FactoryMap::const_iterator p = _factories.find(id); + if(p != _factories.end()) + { + return p->second; + } + + return 0; +} + +void +IcePy::ValueFactoryManager::add(PyObject* valueFactory, PyObject* objectFactory, const string& id) +{ + try + { + add(new FactoryWrapper(valueFactory, objectFactory), id); + } + catch(const Ice::Exception& ex) + { + setPythonException(ex); + } +} + +PyObject* +IcePy::ValueFactoryManager::findValueFactory(const string& id) const +{ + Ice::ValueFactoryPtr f = find(id); + if(f) + { + FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(f); + if(w) + { + return w->getValueFactory(); + } + } + + Py_INCREF(Py_None); + return Py_None; +} + +PyObject* +IcePy::ValueFactoryManager::findObjectFactory(const string& id) const +{ + Ice::ValueFactoryPtr f = find(id); + if(f) + { + FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(f); + if(w) + { + return w->getObjectFactory(); + } + } + + Py_INCREF(Py_None); + return Py_None; +} + +PyObject* +IcePy::ValueFactoryManager::getObject() const +{ + Py_INCREF(_self); + return _self; +} + +void +IcePy::ValueFactoryManager::destroy() +{ + AdoptThread adoptThread; // Ensure the current thread is able to call into Python. + + FactoryMap factories; + + { + Lock lock(*this); + + // + // Break the cyclic reference. + // + Py_DECREF(_self); + _self = 0; + + factories.swap(_factories); + } + + for(FactoryMap::iterator p = factories.begin(); p != factories.end(); ++p) + { + FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(p->second); + if(w) + { + w->destroy(); + } + } + + _defaultFactory->destroy(); +} + +IcePy::FactoryWrapper::FactoryWrapper(PyObject* valueFactory, PyObject* objectFactory) : + _valueFactory(valueFactory), + _objectFactory(objectFactory) +{ + Py_INCREF(_valueFactory); + Py_INCREF(_objectFactory); + assert(_valueFactory != Py_None); // This should always be present. +} + +IcePy::FactoryWrapper::~FactoryWrapper() +{ + Py_DECREF(_valueFactory); + Py_DECREF(_objectFactory); +} + +Ice::ValuePtr +IcePy::FactoryWrapper::create(const string& id) +{ + AdoptThread adoptThread; // Ensure the current thread is able to call into Python. + + // + // Get the type information. + // + ClassInfoPtr info = getClassInfo(id); + + if(!info) + { + return 0; + } + + PyObjectHandle obj = PyObject_CallFunction(_valueFactory, STRCAST("s"), id.c_str()); + + if(!obj.get()) + { + assert(PyErr_Occurred()); + throw AbortMarshaling(); + } + + if(obj.get() == Py_None) + { + return 0; + } + + return new ObjectReader(obj.get(), info); +} + +PyObject* +IcePy::FactoryWrapper::getValueFactory() const +{ + Py_INCREF(_valueFactory); + return _valueFactory; +} + +PyObject* +IcePy::FactoryWrapper::getObjectFactory() const +{ + Py_INCREF(_objectFactory); + return _objectFactory; +} + +void +IcePy::FactoryWrapper::destroy() +{ + if(_objectFactory != Py_None) + { + PyObjectHandle obj = PyObject_CallMethod(_objectFactory, STRCAST("destroy"), 0); + PyErr_Clear(); // Ignore errors. + } +} + +Ice::ValuePtr +IcePy::DefaultValueFactory::create(const string& id) +{ + AdoptThread adoptThread; // Ensure the current thread is able to call into Python. + + Ice::ValuePtr v; + + // + // Give the application-provided default factory a chance to create the object first. + // + if(_delegate) + { + v = _delegate->create(id); + if(v) + { + return v; + } + } + + // + // Get the type information. + // + ClassInfoPtr info = getClassInfo(id); + + if(!info) + { + return 0; + } + + // + // If the requested type is an abstract class, then we give up. + // + if(info->isAbstract) + { + return 0; + } + + // + // Instantiate the object. + // + PyTypeObject* type = reinterpret_cast<PyTypeObject*>(info->pythonType.get()); + PyObjectHandle args = PyTuple_New(0); + PyObjectHandle obj = type->tp_new(type, args.get(), 0); + if(!obj.get()) + { + assert(PyErr_Occurred()); + throw AbortMarshaling(); + } + + return new ObjectReader(obj.get(), info); +} + +void +IcePy::DefaultValueFactory::setDelegate(const Ice::ValueFactoryPtr& d) +{ + _delegate = d; +} + +PyObject* +IcePy::DefaultValueFactory::getValueFactory() const +{ + if(_delegate) + { + FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(_delegate); + if(w) + { + return w->getValueFactory(); + } + } + + Py_INCREF(Py_None); + return Py_None; +} + +PyObject* +IcePy::DefaultValueFactory::getObjectFactory() const +{ + if(_delegate) + { + FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(_delegate); + if(w) + { + return w->getObjectFactory(); + } + } + + Py_INCREF(Py_None); + return Py_None; +} + +void +IcePy::DefaultValueFactory::destroy() +{ + if(_delegate) + { + FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(_delegate); + if(w) + { + w->destroy(); + } + } + + _delegate = 0; +} + +#ifdef WIN32 +extern "C" +#endif +static ValueFactoryManagerObject* +valueFactoryManagerNew(PyTypeObject* /*type*/, PyObject* /*args*/, PyObject* /*kwds*/) +{ + PyErr_Format(PyExc_RuntimeError, STRCAST("Do not instantiate this object directly")); + return 0; +} + +#ifdef WIN32 +extern "C" +#endif +static void +valueFactoryManagerDealloc(ValueFactoryManagerObject* self) +{ + delete self->vfm; + Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self)); +} + +#ifdef WIN32 +extern "C" +#endif +static PyObject* +valueFactoryManagerAdd(ValueFactoryManagerObject* self, PyObject* args) +{ + assert(self->vfm); + + PyObject* factoryType = lookupType("types.FunctionType"); + assert(factoryType); + + PyObject* factory; + PyObject* idObj; + if(!PyArg_ParseTuple(args, STRCAST("O!O"), factoryType, &factory, &idObj)) + { + return 0; + } + + string id; + if(!getStringArg(idObj, "id", id)) + { + return 0; + } + + (*self->vfm)->add(factory, Py_None, id); + if(PyErr_Occurred()) + { + return 0; + } + + Py_INCREF(Py_None); + return Py_None; +} + +#ifdef WIN32 +extern "C" +#endif +static PyObject* +valueFactoryManagerFind(ValueFactoryManagerObject* self, PyObject* args) +{ + assert(self->vfm); + + PyObject* idObj; + if(!PyArg_ParseTuple(args, STRCAST("O"), &idObj)) + { + return 0; + } + + string id; + if(!getStringArg(idObj, "id", id)) + { + return 0; + } + + return (*self->vfm)->findValueFactory(id); +} + +static PyMethodDef ValueFactoryManagerMethods[] = +{ + { STRCAST("add"), reinterpret_cast<PyCFunction>(valueFactoryManagerAdd), METH_VARARGS, + PyDoc_STR(STRCAST("add(factory, id) -> None")) }, + { STRCAST("find"), reinterpret_cast<PyCFunction>(valueFactoryManagerFind), METH_VARARGS, + PyDoc_STR(STRCAST("find(id) -> function")) }, + { 0, 0 } /* sentinel */ +}; + +namespace IcePy +{ + +PyTypeObject ValueFactoryManagerType = +{ + /* The ob_type field must be initialized in the module init function + * to be portable to Windows without using C++. */ + PyVarObject_HEAD_INIT(0, 0) + STRCAST("IcePy.ValueFactoryManager"), /* tp_name */ + sizeof(ValueFactoryManagerObject), /* tp_basicsize */ + 0, /* tp_itemsize */ + /* methods */ + reinterpret_cast<destructor>(valueFactoryManagerDealloc), /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ + 0, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + ValueFactoryManagerMethods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + reinterpret_cast<newfunc>(valueFactoryManagerNew), /* tp_new */ + 0, /* tp_free */ + 0, /* tp_is_gc */ +}; + +} + +bool +IcePy::initValueFactoryManager(PyObject* module) +{ + if(PyType_Ready(&ValueFactoryManagerType) < 0) + { + return false; + } + PyTypeObject* type = &ValueFactoryManagerType; // Necessary to prevent GCC's strict-alias warnings. + if(PyModule_AddObject(module, STRCAST("ValueFactoryManager"), reinterpret_cast<PyObject*>(type)) < 0) + { + return false; + } + + return true; +} diff --git a/python/modules/IcePy/ValueFactoryManager.h b/python/modules/IcePy/ValueFactoryManager.h new file mode 100644 index 00000000000..78f9c804565 --- /dev/null +++ b/python/modules/IcePy/ValueFactoryManager.h @@ -0,0 +1,95 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICEPY_VALUE_FACTORY_MANAGER_H +#define ICEPY_VALUE_FACTORY_MANAGER_H + +#include <Config.h> +#include <Ice/ValueFactory.h> +#include <IceUtil/Mutex.h> + +namespace IcePy +{ + +extern PyTypeObject ValueFactoryManagerType; + +bool initValueFactoryManager(PyObject*); + +class FactoryWrapper : public Ice::ValueFactory +{ +public: + + FactoryWrapper(PyObject*, PyObject*); + ~FactoryWrapper(); + + virtual Ice::ValuePtr create(const std::string&); + + PyObject* getValueFactory() const; + PyObject* getObjectFactory() const; + + void destroy(); + +protected: + + PyObject* _valueFactory; + PyObject* _objectFactory; +}; +typedef IceUtil::Handle<FactoryWrapper> FactoryWrapperPtr; + +class DefaultValueFactory : public Ice::ValueFactory +{ +public: + + virtual Ice::ValuePtr create(const std::string&); + + void setDelegate(const Ice::ValueFactoryPtr&); + Ice::ValueFactoryPtr getDelegate() const { return _delegate; } + + PyObject* getValueFactory() const; + PyObject* getObjectFactory() const; + + void destroy(); + +private: + + Ice::ValueFactoryPtr _delegate; +}; +typedef IceUtil::Handle<DefaultValueFactory> DefaultValueFactoryPtr; + +class ValueFactoryManager : public Ice::ValueFactoryManager, public IceUtil::Mutex +{ +public: + + ValueFactoryManager(); + ~ValueFactoryManager(); + + virtual void add(const Ice::ValueFactoryPtr&, const std::string&); + virtual Ice::ValueFactoryPtr find(const std::string&) const; + + virtual void add(PyObject*, PyObject*, const std::string&); + PyObject* findValueFactory(const std::string&) const; + PyObject* findObjectFactory(const std::string&) const; + + PyObject* getObject() const; + + void destroy(); + +private: + + typedef std::map<std::string, Ice::ValueFactoryPtr> FactoryMap; + + PyObject* _self; + FactoryMap _factories; + DefaultValueFactoryPtr _defaultFactory; +}; +typedef IceUtil::Handle<ValueFactoryManager> ValueFactoryManagerPtr; + +} + +#endif diff --git a/python/python/Ice.py b/python/python/Ice.py index b8eab3edee3..e3d5d32b46e 100644 --- a/python/python/Ice.py +++ b/python/python/Ice.py @@ -565,6 +565,7 @@ threadHook: An object that implements ThreadNotification. self.logger = None self.threadHook = None self.batchRequestInterceptor = None + self.valueFactoryManager = None # # Communicator wrapper. @@ -623,20 +624,14 @@ class CommunicatorI(Communicator): return ObjectAdapterI(adapter) def addObjectFactory(self, factory, id): - # Add a ValueFactory and an ObjectFactory. The ValueFactory is the one - # which is used. ObjectFactory is for backward compatibility, and must - # be added first. - self._impl.addObjectFactory(factory, id) - self._impl.addValueFactory(lambda s, factory=factory: factory.create(s), id) + # The extension implementation requires an extra argument that is a value factory + self._impl.addObjectFactory(factory, id, lambda s, factory=factory: factory.create(s)) def findObjectFactory(self, id): return self._impl.findObjectFactory(id) - def addValueFactory(self, factory, id): - self._impl.addValueFactory(factory, id) - - def findValueFactory(self, id): - return self._impl.findValueFactory(id) + def getValueFactoryManager(self): + return self._impl.getValueFactoryManager() def getImplicitContext(self): context = self._impl.getImplicitContext() diff --git a/python/test/Ice/exceptions/AllTests.py b/python/test/Ice/exceptions/AllTests.py index 2c95ecff595..975f75b28e6 100644 --- a/python/test/Ice/exceptions/AllTests.py +++ b/python/test/Ice/exceptions/AllTests.py @@ -270,9 +270,9 @@ def allTests(communicator): sys.stdout.write("testing object factory registration exception... ") sys.stdout.flush() - communicator.addValueFactory(ValueFactory, "x") + communicator.getValueFactoryManager().add(ValueFactory, "x") try: - communicator.addValueFactory(ValueFactory, "x") + communicator.getValueFactoryManager().add(ValueFactory, "x") test(false) except Ice.AlreadyRegisteredException: pass diff --git a/python/test/Ice/objects/AllTests.py b/python/test/Ice/objects/AllTests.py index c82f1e3c447..59c43f4a744 100644 --- a/python/test/Ice/objects/AllTests.py +++ b/python/test/Ice/objects/AllTests.py @@ -40,14 +40,14 @@ def test(b): raise RuntimeError('test assertion failed') def allTests(communicator): - communicator.addValueFactory(MyValueFactory, '::Test::B') - communicator.addValueFactory(MyValueFactory, '::Test::C') - communicator.addValueFactory(MyValueFactory, '::Test::D') - communicator.addValueFactory(MyValueFactory, '::Test::E') - communicator.addValueFactory(MyValueFactory, '::Test::F') - communicator.addValueFactory(MyValueFactory, '::Test::I') - communicator.addValueFactory(MyValueFactory, '::Test::J') - communicator.addValueFactory(MyValueFactory, '::Test::H') + communicator.getValueFactoryManager().add(MyValueFactory, '::Test::B') + communicator.getValueFactoryManager().add(MyValueFactory, '::Test::C') + communicator.getValueFactoryManager().add(MyValueFactory, '::Test::D') + communicator.getValueFactoryManager().add(MyValueFactory, '::Test::E') + communicator.getValueFactoryManager().add(MyValueFactory, '::Test::F') + communicator.getValueFactoryManager().add(MyValueFactory, '::Test::I') + communicator.getValueFactoryManager().add(MyValueFactory, '::Test::J') + communicator.getValueFactoryManager().add(MyValueFactory, '::Test::H') communicator.addObjectFactory(MyObjectFactory(), "TestOF") @@ -254,7 +254,7 @@ def allTests(communicator): sys.stdout.write("testing getting ObjectFactory as ValueFactory... ") sys.stdout.flush() - test(communicator.findValueFactory("TestOF") != None) + test(communicator.getValueFactoryManager().find("TestOF") != None) print("ok") return initial diff --git a/python/test/Ice/objects/Server.py b/python/test/Ice/objects/Server.py index e3d588b2da4..a2d01523c08 100755 --- a/python/test/Ice/objects/Server.py +++ b/python/test/Ice/objects/Server.py @@ -25,9 +25,9 @@ def MyValueFactory(type): assert(False) # Should never be reached def run(args, communicator): - communicator.addValueFactory(MyValueFactory, '::Test::I') - communicator.addValueFactory(MyValueFactory, '::Test::J') - communicator.addValueFactory(MyValueFactory, '::Test::H') + communicator.getValueFactoryManager().add(MyValueFactory, '::Test::I') + communicator.getValueFactoryManager().add(MyValueFactory, '::Test::J') + communicator.getValueFactoryManager().add(MyValueFactory, '::Test::H') communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") diff --git a/python/test/Ice/slicing/objects/AllTests.py b/python/test/Ice/slicing/objects/AllTests.py index f836c2b993e..3d44a3323ab 100644 --- a/python/test/Ice/slicing/objects/AllTests.py +++ b/python/test/Ice/slicing/objects/AllTests.py @@ -1666,7 +1666,7 @@ def allTests(communicator): # UCNode. This provides an easy way to determine how many # unmarshaled instances currently exist. # - communicator.addValueFactory(NodeFactoryI, Test.PNode.ice_staticId()) + communicator.getValueFactoryManager().add(NodeFactoryI, Test.PNode.ice_staticId()) # # Relay a graph through the server. This test uses a preserved class @@ -1753,7 +1753,7 @@ def allTests(communicator): # Preserved. This provides an easy way to determine how many # unmarshaled instances currently exist. # - communicator.addValueFactory(PreservedFactoryI, Test.Preserved.ice_staticId()) + communicator.getValueFactoryManager().add(PreservedFactoryI, Test.Preserved.ice_staticId()) # # Obtain a preserved object from the server where the most-derived diff --git a/ruby/src/IceRuby/Communicator.cpp b/ruby/src/IceRuby/Communicator.cpp index 12d1205f55c..f67f490a560 100644 --- a/ruby/src/IceRuby/Communicator.cpp +++ b/ruby/src/IceRuby/Communicator.cpp @@ -10,11 +10,11 @@ #include <Communicator.h> #include <ImplicitContext.h> #include <Logger.h> -#include <ObjectFactory.h> #include <Properties.h> #include <Proxy.h> #include <Types.h> #include <Util.h> +#include <ValueFactoryManager.h> #include <IceUtil/DisableWarnings.h> #include <Ice/Communicator.h> #include <Ice/Initialize.h> @@ -38,9 +38,9 @@ IceRuby_Communicator_mark(Ice::CommunicatorPtr* p) assert(p); try { - ObjectFactoryPtr pof = ObjectFactoryPtr::dynamicCast((*p)->findObjectFactory("")); - assert(pof); - pof->mark(); + ValueFactoryManagerPtr vfm = ValueFactoryManagerPtr::dynamicCast((*p)->getValueFactoryManager()); + assert(vfm); + vfm->markSelf(); } catch(const Ice::CommunicatorDestroyedException&) { @@ -129,6 +129,7 @@ IceRuby_initialize(int argc, VALUE* argv, VALUE self) seq.insert(seq.begin(), getString(progName)); data.compactIdResolver = new IdResolver; + data.valueFactoryManager = new ValueFactoryManager; if(hasArgs) { @@ -206,9 +207,6 @@ IceRuby_initialize(int argc, VALUE* argv, VALUE self) } delete[] av; - ObjectFactoryPtr factory = new ObjectFactory; - communicator->addObjectFactory(factory, ""); - VALUE result = Data_Wrap_Struct(_communicatorClass, IceRuby_Communicator_mark, IceRuby_Communicator_free, new Ice::CommunicatorPtr(communicator)); @@ -229,12 +227,19 @@ extern "C" VALUE IceRuby_Communicator_destroy(VALUE self) { + Ice::CommunicatorPtr p = getCommunicator(self); + + ValueFactoryManagerPtr vfm = ValueFactoryManagerPtr::dynamicCast(p->getValueFactoryManager()); + assert(vfm); + ICE_RUBY_TRY { - Ice::CommunicatorPtr p = getCommunicator(self); p->destroy(); } ICE_RUBY_CATCH + + vfm->destroy(); + return Qnil; } @@ -387,26 +392,10 @@ IceRuby_Communicator_addObjectFactory(VALUE self, VALUE factory, VALUE id) ICE_RUBY_TRY { Ice::CommunicatorPtr p = getCommunicator(self); - ObjectFactoryPtr pof = ObjectFactoryPtr::dynamicCast(p->findObjectFactory("")); - assert(pof); + ValueFactoryManagerPtr vfm = ValueFactoryManagerPtr::dynamicCast(p->getValueFactoryManager()); + assert(vfm); string idstr = getString(id); - pof->addObjectFactory(factory, idstr); - } - ICE_RUBY_CATCH - return Qnil; -} - -extern "C" -VALUE -IceRuby_Communicator_addValueFactory(VALUE self, VALUE factory, VALUE id) -{ - ICE_RUBY_TRY - { - Ice::CommunicatorPtr p = getCommunicator(self); - ObjectFactoryPtr pof = ObjectFactoryPtr::dynamicCast(p->findObjectFactory("")); - assert(pof); - string idstr = getString(id); - pof->addValueFactory(factory, idstr); + vfm->addObjectFactory(factory, idstr); } ICE_RUBY_CATCH return Qnil; @@ -419,10 +408,10 @@ IceRuby_Communicator_findObjectFactory(VALUE self, VALUE id) ICE_RUBY_TRY { Ice::CommunicatorPtr p = getCommunicator(self); - ObjectFactoryPtr pof = ObjectFactoryPtr::dynamicCast(p->findObjectFactory("")); - assert(pof); + ValueFactoryManagerPtr vfm = ValueFactoryManagerPtr::dynamicCast(p->getValueFactoryManager()); + assert(vfm); string idstr = getString(id); - return pof->findObjectFactory(idstr); + return vfm->findObjectFactory(idstr); } ICE_RUBY_CATCH return Qnil; @@ -430,15 +419,14 @@ IceRuby_Communicator_findObjectFactory(VALUE self, VALUE id) extern "C" VALUE -IceRuby_Communicator_findValueFactory(VALUE self, VALUE id) +IceRuby_Communicator_getValueFactoryManager(VALUE self) { ICE_RUBY_TRY { Ice::CommunicatorPtr p = getCommunicator(self); - ObjectFactoryPtr pof = ObjectFactoryPtr::dynamicCast(p->findObjectFactory("")); - assert(pof); - string idstr = getString(id); - return pof->findValueFactory(idstr); + ValueFactoryManagerPtr vfm = ValueFactoryManagerPtr::dynamicCast(p->getValueFactoryManager()); + assert(vfm); + return vfm->getObject(); } ICE_RUBY_CATCH return Qnil; @@ -599,8 +587,7 @@ IceRuby::initCommunicator(VALUE iceModule) rb_define_method(_communicatorClass, "identityToString", CAST_METHOD(IceRuby_Communicator_identityToString), 1); rb_define_method(_communicatorClass, "addObjectFactory", CAST_METHOD(IceRuby_Communicator_addObjectFactory), 2); rb_define_method(_communicatorClass, "findObjectFactory", CAST_METHOD(IceRuby_Communicator_findObjectFactory), 1); - rb_define_method(_communicatorClass, "addValueFactory", CAST_METHOD(IceRuby_Communicator_addValueFactory), 2); - rb_define_method(_communicatorClass, "findValueFactory", CAST_METHOD(IceRuby_Communicator_findValueFactory), 1); + rb_define_method(_communicatorClass, "getValueFactoryManager", CAST_METHOD(IceRuby_Communicator_getValueFactoryManager), 0); rb_define_method(_communicatorClass, "getImplicitContext", CAST_METHOD(IceRuby_Communicator_getImplicitContext), 0); rb_define_method(_communicatorClass, "getProperties", CAST_METHOD(IceRuby_Communicator_getProperties), 0); rb_define_method(_communicatorClass, "getLogger", CAST_METHOD(IceRuby_Communicator_getLogger), 0); diff --git a/ruby/src/IceRuby/Init.cpp b/ruby/src/IceRuby/Init.cpp index 2086f163383..6f2978827bd 100644 --- a/ruby/src/IceRuby/Init.cpp +++ b/ruby/src/IceRuby/Init.cpp @@ -17,6 +17,7 @@ #include <Types.h> #include <Connection.h> #include <Endpoint.h> +#include <ValueFactoryManager.h> using namespace std; using namespace IceRuby; @@ -54,6 +55,7 @@ ICE_DECLSPEC_EXPORT Init_IceRuby() initUtil(iceModule); initConnection(iceModule); initEndpoint(iceModule); + initValueFactoryManager(iceModule); } } diff --git a/ruby/src/IceRuby/Makefile b/ruby/src/IceRuby/Makefile index a75e70b58aa..25a00206624 100644 --- a/ruby/src/IceRuby/Makefile +++ b/ruby/src/IceRuby/Makefile @@ -20,13 +20,13 @@ OBJS = Communicator.o \ ImplicitContext.o \ Init.o \ Logger.o \ - ObjectFactory.o \ Operation.o \ Properties.o \ Proxy.o \ Slice.o \ Types.o \ - Util.o + Util.o \ + ValueFactoryManager.o include $(top_srcdir)/config/Make.rules diff --git a/ruby/src/IceRuby/ObjectFactory.cpp b/ruby/src/IceRuby/ObjectFactory.cpp deleted file mode 100644 index ed37fdd86fb..00000000000 --- a/ruby/src/IceRuby/ObjectFactory.cpp +++ /dev/null @@ -1,179 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <ObjectFactory.h> -#include <Types.h> -#include <Util.h> -#include <Ice/LocalException.h> - -using namespace std; -using namespace IceRuby; - -IceRuby::ObjectFactory::ObjectFactory() -{ -} - -IceRuby::ObjectFactory::~ObjectFactory() -{ - assert(_valueFactoryMap.empty()); - assert(_objectFactoryMap.empty()); -} - -Ice::ObjectPtr -IceRuby::ObjectFactory::create(const string& id) -{ - Lock sync(*this); - - // - // Get the type information. - // - ClassInfoPtr info; - if(id == Ice::Object::ice_staticId()) - { - // - // When the ID is that of Ice::Object, it indicates that the stream has not - // found a factory and is providing us an opportunity to preserve the object. - // - info = lookupClassInfo("::Ice::UnknownSlicedObject"); - } - else - { - info = lookupClassInfo(id); - } - - if(!info) - { - return 0; - } - - // - // Check if the application has registered a factory for this id. - // - FactoryMap::iterator p = _valueFactoryMap.find(id); - if(p != _valueFactoryMap.end()) - { - // - // Invoke the create method on the Ruby factory object. - // - volatile VALUE str = createString(id); - volatile VALUE obj = callRuby(rb_funcall, p->second, rb_intern("create"), 1, str); - if(NIL_P(obj)) - { - return 0; - } - return new ObjectReader(obj, info); - } - - // - // Instantiate the object. - // - volatile VALUE obj = callRuby(rb_class_new_instance, 0, reinterpret_cast<VALUE*>(0), info->rubyClass); - assert(!NIL_P(obj)); - return new ObjectReader(obj, info); -} - -void -IceRuby::ObjectFactory::destroy() -{ - Lock sync(*this); - - for(FactoryMap::iterator p = _objectFactoryMap.begin(); p != _objectFactoryMap.end(); ++p) - { - // - // Invoke the destroy method on each registered Ruby object factory. - // - try - { - callRuby(rb_funcall, p->second, rb_intern("destroy"), 0); - } - catch(const RubyException&) - { - // Ignore. - } - } - - _valueFactoryMap.clear(); - _objectFactoryMap.clear(); -} - -void -IceRuby::ObjectFactory::addValueFactory(VALUE factory, const string& id) -{ - Lock sync(*this); - - FactoryMap::iterator p = _valueFactoryMap.find(id); - if(p != _valueFactoryMap.end()) - { - Ice::AlreadyRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = "value factory"; - ex.id = id; - throw ex; - } - - _valueFactoryMap.insert(FactoryMap::value_type(id, factory)); -} - -void -IceRuby::ObjectFactory::addObjectFactory(VALUE factory, const string& id) -{ - Lock sync(*this); - - FactoryMap::iterator p = _valueFactoryMap.find(id); - if(p != _valueFactoryMap.end()) - { - Ice::AlreadyRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = "value factory"; - ex.id = id; - throw ex; - } - - _valueFactoryMap.insert(FactoryMap::value_type(id, factory)); - _objectFactoryMap.insert(FactoryMap::value_type(id, factory)); -} - -VALUE -IceRuby::ObjectFactory::findValueFactory(const string& id) -{ - Lock sync(*this); - - FactoryMap::iterator p = _valueFactoryMap.find(id); - if(p == _valueFactoryMap.end()) - { - return Qnil; - } - - return p->second; -} - -VALUE -IceRuby::ObjectFactory::findObjectFactory(const string& id) -{ - Lock sync(*this); - - FactoryMap::iterator p = _objectFactoryMap.find(id); - if(p == _objectFactoryMap.end()) - { - return Qnil; - } - - return p->second; -} - -void -IceRuby::ObjectFactory::mark() -{ - for(FactoryMap::iterator p = _valueFactoryMap.begin(); p != _valueFactoryMap.end(); ++p) - { - rb_gc_mark(p->second); - } - for(FactoryMap::iterator p = _objectFactoryMap.begin(); p != _objectFactoryMap.end(); ++p) - { - rb_gc_mark(p->second); - } -} diff --git a/ruby/src/IceRuby/ObjectFactory.h b/ruby/src/IceRuby/ObjectFactory.h deleted file mode 100644 index 0d5c29a7d6a..00000000000 --- a/ruby/src/IceRuby/ObjectFactory.h +++ /dev/null @@ -1,53 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef ICE_RUBY_OBJECT_FACTORY_H -#define ICE_RUBY_OBJECT_FACTORY_H - -#include <Config.h> -#include <Ice/ObjectF.h> -#include <Ice/ObjectFactory.h> -#include <IceUtil/Mutex.h> - -namespace IceRuby -{ - -// -// Each communicator registers an instance of ObjectFactory as its -// default object factory. This instance delegates to registered Ruby -// objects, and instantiates concrete classes when no factory is present. -// -class ObjectFactory : public Ice::ObjectFactory, public IceUtil::Mutex -{ -public: - - ObjectFactory(); - ~ObjectFactory(); - - virtual Ice::ObjectPtr create(const std::string&); - - virtual void destroy(); - - void addValueFactory(VALUE, const std::string&); - VALUE findValueFactory(const std::string&); - void addObjectFactory(VALUE, const std::string&); - VALUE findObjectFactory(const std::string&); - void mark(); - -private: - - typedef std::map<std::string, VALUE> FactoryMap; - FactoryMap _valueFactoryMap; - FactoryMap _objectFactoryMap; -}; -typedef IceUtil::Handle<ObjectFactory> ObjectFactoryPtr; - -} - -#endif diff --git a/ruby/src/IceRuby/Operation.cpp b/ruby/src/IceRuby/Operation.cpp index cbfa9581070..1f81af99ccd 100644 --- a/ruby/src/IceRuby/Operation.cpp +++ b/ruby/src/IceRuby/Operation.cpp @@ -71,7 +71,7 @@ private: void convertParams(VALUE, ParamInfoList&, int, bool&); ParamInfoPtr convertParam(VALUE, int); - void prepareRequest(const Ice::ObjectPrx&, VALUE, Ice::OutputStreamPtr&, pair<const Ice::Byte*, const Ice::Byte*>&); + void prepareRequest(const Ice::ObjectPrx&, VALUE, Ice::OutputStream*, pair<const Ice::Byte*, const Ice::Byte*>&); VALUE unmarshalResults(const vector<Ice::Byte>&, const Ice::CommunicatorPtr&); VALUE unmarshalException(const vector<Ice::Byte>&, const Ice::CommunicatorPtr&); bool validateException(VALUE) const; @@ -79,27 +79,18 @@ private: }; typedef IceUtil::Handle<OperationI> OperationIPtr; -class UserExceptionReaderFactoryI : public Ice::UserExceptionReaderFactory +class UserExceptionFactory : public Ice::UserExceptionFactory { public: - UserExceptionReaderFactoryI(const Ice::CommunicatorPtr& communicator) : - _communicator(communicator) - { - } - - virtual void createAndThrow(const string& id) const + virtual void createAndThrow(const string& id) { ExceptionInfoPtr info = lookupExceptionInfo(id); if(info) { - throw ExceptionReader(_communicator, info); + throw ExceptionReader(info); } } - -private: - - const Ice::CommunicatorPtr _communicator; }; } @@ -299,9 +290,9 @@ IceRuby::OperationI::invoke(const Ice::ObjectPrx& proxy, VALUE args, VALUE hctx) // // Marshal the input parameters to a byte sequence. // - Ice::OutputStreamPtr os; + Ice::OutputStream os(communicator); pair<const Ice::Byte*, const Ice::Byte*> params; - prepareRequest(proxy, args, os, params); + prepareRequest(proxy, args, &os, params); if(!_deprecateMessage.empty()) { @@ -409,7 +400,7 @@ IceRuby::OperationI::convertParam(VALUE v, int pos) } void -IceRuby::OperationI::prepareRequest(const Ice::ObjectPrx& proxy, VALUE args, Ice::OutputStreamPtr& os, +IceRuby::OperationI::prepareRequest(const Ice::ObjectPrx& proxy, VALUE args, Ice::OutputStream* os, pair<const Ice::Byte*, const Ice::Byte*>& params) { params.first = params.second = static_cast<const Ice::Byte*>(0); @@ -430,7 +421,6 @@ IceRuby::OperationI::prepareRequest(const Ice::ObjectPrx& proxy, VALUE args, Ice // // Marshal the in parameters. // - os = Ice::createOutputStream(proxy->ice_getCommunicator()); os->startEncapsulation(proxy->ice_getEncodingVersion(), _format); ObjectMap objectMap; @@ -471,7 +461,7 @@ IceRuby::OperationI::prepareRequest(const Ice::ObjectPrx& proxy, VALUE args, Ice { ParamInfoPtr info = *p; volatile VALUE arg = RARRAY_PTR(args)[info->pos]; - if(arg != Unset && os->writeOptional(info->tag, info->type->optionalFormat())) + if(arg != Unset && os->writeOpt(info->tag, info->type->optionalFormat())) { info->type->marshal(arg, os, &objectMap, true); } @@ -503,17 +493,17 @@ IceRuby::OperationI::unmarshalResults(const vector<Ice::Byte>& bytes, const Ice: // Unmarshal the results. If there is more than one value to be returned, then return them // in a tuple of the form (result, outParam1, ...). Otherwise just return the value. // - Ice::InputStreamPtr is = Ice::wrapInputStream(communicator, bytes); + Ice::InputStream is(communicator, bytes); // - // Store a pointer to a local SlicedDataUtil object as the stream's closure. + // Store a pointer to a local StreamUtil object as the stream's closure. // This is necessary to support object unmarshaling (see ObjectReader). // - SlicedDataUtil util; - assert(!is->closure()); - is->closure(&util); + StreamUtil util; + assert(!is.getClosure()); + is.setClosure(&util); - is->startEncapsulation(); + is.startEncapsulation(); ParamInfoList::iterator p; @@ -526,7 +516,7 @@ IceRuby::OperationI::unmarshalResults(const vector<Ice::Byte>& bytes, const Ice: if(!info->optional) { void* closure = reinterpret_cast<void*>(info->pos); - info->type->unmarshal(is, info, results, closure, false); + info->type->unmarshal(&is, info, results, closure, false); } } @@ -537,7 +527,7 @@ IceRuby::OperationI::unmarshalResults(const vector<Ice::Byte>& bytes, const Ice: { assert(_returnType->pos == 0); void* closure = reinterpret_cast<void*>(_returnType->pos); - _returnType->type->unmarshal(is, _returnType, results, closure, false); + _returnType->type->unmarshal(&is, _returnType, results, closure, false); } // @@ -546,10 +536,10 @@ IceRuby::OperationI::unmarshalResults(const vector<Ice::Byte>& bytes, const Ice: for(p = _optionalOutParams.begin(); p != _optionalOutParams.end(); ++p) { ParamInfoPtr info = *p; - if(is->readOptional(info->tag, info->type->optionalFormat())) + if(is.readOpt(info->tag, info->type->optionalFormat())) { void* closure = reinterpret_cast<void*>(info->pos); - info->type->unmarshal(is, info, results, closure, true); + info->type->unmarshal(&is, info, results, closure, true); } else { @@ -559,12 +549,12 @@ IceRuby::OperationI::unmarshalResults(const vector<Ice::Byte>& bytes, const Ice: if(_returnsClasses) { - is->readPendingObjects(); + is.readPendingObjects(); } - is->endEncapsulation(); + is.endEncapsulation(); - util.update(); + util.updateSlicedData(); return results; } @@ -572,37 +562,37 @@ IceRuby::OperationI::unmarshalResults(const vector<Ice::Byte>& bytes, const Ice: VALUE IceRuby::OperationI::unmarshalException(const vector<Ice::Byte>& bytes, const Ice::CommunicatorPtr& communicator) { - Ice::InputStreamPtr is = Ice::wrapInputStream(communicator, bytes); + Ice::InputStream is(communicator, bytes); // - // Store a pointer to a local SlicedDataUtil object as the stream's closure. + // Store a pointer to a local StreamUtil object as the stream's closure. // This is necessary to support object unmarshaling (see ObjectReader). // - SlicedDataUtil util; - assert(!is->closure()); - is->closure(&util); + StreamUtil util; + assert(!is.getClosure()); + is.setClosure(&util); - is->startEncapsulation(); + is.startEncapsulation(); try { - Ice::UserExceptionReaderFactoryPtr factory = new UserExceptionReaderFactoryI(communicator); - is->throwException(factory); + Ice::UserExceptionFactoryPtr factory = new UserExceptionFactory; + is.throwException(factory); } catch(const ExceptionReader& r) { - is->endEncapsulation(); + is.endEncapsulation(); volatile VALUE ex = r.getException(); if(validateException(ex)) { - util.update(); + util.updateSlicedData(); Ice::SlicedDataPtr slicedData = r.getSlicedData(); if(slicedData) { - SlicedDataUtil::setMember(ex, slicedData); + StreamUtil::setSlicedDataMember(ex, slicedData); } return ex; @@ -622,7 +612,6 @@ IceRuby::OperationI::unmarshalException(const vector<Ice::Byte>& bytes, const Ic #ifdef __SUNPRO_CC return 0; #endif - } bool diff --git a/ruby/src/IceRuby/Types.cpp b/ruby/src/IceRuby/Types.cpp index 2a7196aa606..da5832c7f9a 100644 --- a/ruby/src/IceRuby/Types.cpp +++ b/ruby/src/IceRuby/Types.cpp @@ -13,7 +13,9 @@ #include <IceUtil/InputUtil.h> #include <IceUtil/OutputUtil.h> #include <IceUtil/ScopedArray.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> +#include <Ice/OutputStream.h> #include <Ice/SlicedData.h> #include <list> #include <limits> @@ -63,22 +65,6 @@ public: }; static InfoMapDestroyer infoMapDestroyer; -class ReadObjectCallback : public Ice::ReadObjectCallback -{ -public: - - ReadObjectCallback(const ClassInfoPtr&, const UnmarshalCallbackPtr&, VALUE, void*); - - virtual void invoke(const Ice::ObjectPtr&); - -private: - - ClassInfoPtr _info; - UnmarshalCallbackPtr _cb; - VALUE _target; - void* _closure; -}; - string escapeString(const string& str) { @@ -184,16 +170,16 @@ addExceptionInfo(const string& id, const ExceptionInfoPtr& info) } // -// SlicedDataUtil implementation +// StreamUtil implementation // -VALUE IceRuby::SlicedDataUtil::_slicedDataType = Qnil; -VALUE IceRuby::SlicedDataUtil::_sliceInfoType = Qnil; +VALUE IceRuby::StreamUtil::_slicedDataType = Qnil; +VALUE IceRuby::StreamUtil::_sliceInfoType = Qnil; -IceRuby::SlicedDataUtil::SlicedDataUtil() +IceRuby::StreamUtil::StreamUtil() { } -IceRuby::SlicedDataUtil::~SlicedDataUtil() +IceRuby::StreamUtil::~StreamUtil() { // // Make sure we break any cycles among the ObjectReaders in preserved slices. @@ -216,23 +202,29 @@ IceRuby::SlicedDataUtil::~SlicedDataUtil() } void -IceRuby::SlicedDataUtil::add(const ObjectReaderPtr& reader) +IceRuby::StreamUtil::add(const ReadObjectCallbackPtr& callback) +{ + _callbacks.push_back(callback); +} + +void +IceRuby::StreamUtil::add(const ObjectReaderPtr& reader) { assert(reader->getSlicedData()); _readers.insert(reader); } void -IceRuby::SlicedDataUtil::update() +IceRuby::StreamUtil::updateSlicedData() { for(set<ObjectReaderPtr>::iterator p = _readers.begin(); p != _readers.end(); ++p) { - setMember((*p)->getObject(), (*p)->getSlicedData()); + setSlicedDataMember((*p)->getObject(), (*p)->getSlicedData()); } } void -IceRuby::SlicedDataUtil::setMember(VALUE obj, const Ice::SlicedDataPtr& slicedData) +IceRuby::StreamUtil::setSlicedDataMember(VALUE obj, const Ice::SlicedDataPtr& slicedData) { // // Create a Ruby equivalent of the SlicedData object. @@ -325,7 +317,7 @@ IceRuby::SlicedDataUtil::setMember(VALUE obj, const Ice::SlicedDataPtr& slicedDa // named _ice_slicedData which is an instance of the Ruby class Ice::SlicedData. // Ice::SlicedDataPtr -IceRuby::SlicedDataUtil::getMember(VALUE obj, ObjectMap* objectMap) +IceRuby::StreamUtil::getSlicedDataMember(VALUE obj, ObjectMap* objectMap) { Ice::SlicedDataPtr slicedData; @@ -544,7 +536,7 @@ IceRuby::PrimitiveInfo::optionalFormat() const } void -IceRuby::PrimitiveInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMap*, bool) +IceRuby::PrimitiveInfo::marshal(VALUE p, Ice::OutputStream* os, ObjectMap*, bool) { switch(kind) { @@ -625,7 +617,7 @@ IceRuby::PrimitiveInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectM } void -IceRuby::PrimitiveInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, VALUE target, +IceRuby::PrimitiveInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, VALUE target, void* closure, bool) { volatile VALUE val = Qnil; @@ -814,7 +806,7 @@ IceRuby::EnumInfo::optionalFormat() const } void -IceRuby::EnumInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMap*, bool) +IceRuby::EnumInfo::marshal(VALUE p, Ice::OutputStream* os, ObjectMap*, bool) { assert(callRuby(rb_obj_is_instance_of, p, rubyClass) == Qtrue); // validate() should have caught this. @@ -832,7 +824,7 @@ IceRuby::EnumInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMap*, } void -IceRuby::EnumInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, VALUE target, void* closure, +IceRuby::EnumInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, VALUE target, void* closure, bool) { Ice::Int val = is->readEnum(maxValue); @@ -995,7 +987,7 @@ IceRuby::StructInfo::usesClasses() const } void -IceRuby::StructInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMap* objectMap, bool optional) +IceRuby::StructInfo::marshal(VALUE p, Ice::OutputStream* os, ObjectMap* objectMap, bool optional) { assert(NIL_P(p) || callRuby(rb_obj_is_kind_of, p, rubyClass) == Qtrue); // validate() should have caught this. @@ -1041,7 +1033,7 @@ IceRuby::StructInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMap* } void -IceRuby::StructInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, VALUE target, +IceRuby::StructInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, VALUE target, void* closure, bool optional) { volatile VALUE obj = callRuby(rb_class_new_instance, 0, static_cast<VALUE*>(0), rubyClass); @@ -1178,7 +1170,7 @@ IceRuby::SequenceInfo::usesClasses() const } void -IceRuby::SequenceInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMap* objectMap, bool optional) +IceRuby::SequenceInfo::marshal(VALUE p, Ice::OutputStream* os, ObjectMap* objectMap, bool optional) { PrimitiveInfoPtr pi = PrimitiveInfoPtr::dynamicCast(elementType); @@ -1256,7 +1248,7 @@ IceRuby::SequenceInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMa } void -IceRuby::SequenceInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, VALUE target, +IceRuby::SequenceInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, VALUE target, void* closure, bool optional) { if(optional) @@ -1355,7 +1347,7 @@ IceRuby::SequenceInfo::destroy() } void -IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALUE p, const Ice::OutputStreamPtr& os) +IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALUE p, Ice::OutputStream* os) { volatile VALUE arr = Qnil; volatile VALUE str = Qnil; @@ -1517,14 +1509,14 @@ IceRuby::SequenceInfo::marshalPrimitiveSequence(const PrimitiveInfoPtr& pi, VALU { seq[i] = getString(RARRAY_PTR(arr)[i]); } - os->write(seq, true); + os->write(&seq[0], &seq[0] + seq.size()); break; } } } void -IceRuby::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, const Ice::InputStreamPtr& is, +IceRuby::SequenceInfo::unmarshalPrimitiveSequence(const PrimitiveInfoPtr& pi, Ice::InputStream* is, const UnmarshalCallbackPtr& cb, VALUE target, void* closure) { volatile VALUE result = Qnil; @@ -1721,7 +1713,7 @@ namespace { struct DictionaryMarshalIterator : public IceRuby::HashIterator { - DictionaryMarshalIterator(const IceRuby::DictionaryInfoPtr& d, const Ice::OutputStreamPtr o, IceRuby::ObjectMap* m) + DictionaryMarshalIterator(const IceRuby::DictionaryInfoPtr& d, Ice::OutputStream* o, IceRuby::ObjectMap* m) : dict(d), os(o), objectMap(m) { } @@ -1732,13 +1724,13 @@ struct DictionaryMarshalIterator : public IceRuby::HashIterator } IceRuby::DictionaryInfoPtr dict; - Ice::OutputStreamPtr os; + Ice::OutputStream* os; IceRuby::ObjectMap* objectMap; }; } void -IceRuby::DictionaryInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMap* objectMap, bool optional) +IceRuby::DictionaryInfo::marshal(VALUE p, Ice::OutputStream* os, ObjectMap* objectMap, bool optional) { volatile VALUE hash = Qnil; @@ -1791,7 +1783,7 @@ IceRuby::DictionaryInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, Object } void -IceRuby::DictionaryInfo::marshalElement(VALUE key, VALUE value, const Ice::OutputStreamPtr& os, ObjectMap* objectMap) +IceRuby::DictionaryInfo::marshalElement(VALUE key, VALUE value, Ice::OutputStream* os, ObjectMap* objectMap) { if(!keyType->validate(key)) { @@ -1808,7 +1800,7 @@ IceRuby::DictionaryInfo::marshalElement(VALUE key, VALUE value, const Ice::Outpu } void -IceRuby::DictionaryInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, VALUE target, +IceRuby::DictionaryInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, VALUE target, void* closure, bool optional) { if(optional) @@ -2062,7 +2054,7 @@ IceRuby::ClassInfo::usesClasses() const } void -IceRuby::ClassInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMap* objectMap, bool) +IceRuby::ClassInfo::marshal(VALUE p, Ice::OutputStream* os, ObjectMap* objectMap, bool) { if(!defined) { @@ -2071,7 +2063,8 @@ IceRuby::ClassInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMap* if(NIL_P(p)) { - os->writeObject(0); + Ice::ObjectPtr nil; + os->write(nil); return; } @@ -2097,19 +2090,40 @@ IceRuby::ClassInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMap* // // Give the writer to the stream. The stream will eventually call write() on it. // - os->writeObject(writer); + os->write(writer); +} + +namespace +{ + +void +patchObject(void* addr, const Ice::ObjectPtr& v) +{ + ReadObjectCallback* cb = static_cast<ReadObjectCallback*>(addr); + assert(cb); + cb->invoke(v); +} + } void -IceRuby::ClassInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, VALUE target, - void* closure, bool) +IceRuby::ClassInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, VALUE target, void* closure, bool) { if(!defined) { throw RubyException(rb_eRuntimeError, "class %s is declared but not defined", id.c_str()); } - is->readObject(new ReadObjectCallback(this, cb, target, closure)); + // + // This callback is notified when the Slice value is actually read. The StreamUtil object + // attached to the stream keeps a reference to the callback object to ensure it lives + // long enough. + // + ReadObjectCallbackPtr rocb = new ReadObjectCallback(this, cb, target, closure); + StreamUtil* util = reinterpret_cast<StreamUtil*>(is->getClosure()); + assert(util); + util->add(rocb); + is->read(patchObject, rocb.get()); } void @@ -2336,7 +2350,7 @@ IceRuby::ProxyInfo::optionalFormat() const } void -IceRuby::ProxyInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMap*, bool optional) +IceRuby::ProxyInfo::marshal(VALUE p, Ice::OutputStream* os, ObjectMap*, bool optional) { Ice::OutputStream::size_type sizePos = -1; if(optional) @@ -2361,7 +2375,7 @@ IceRuby::ProxyInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMap*, } void -IceRuby::ProxyInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCallbackPtr& cb, VALUE target, +IceRuby::ProxyInfo::unmarshal(Ice::InputStream* is, const UnmarshalCallbackPtr& cb, VALUE target, void* closure, bool optional) { if(optional) @@ -2446,7 +2460,7 @@ IceRuby::ObjectWriter::ice_preMarshal() } void -IceRuby::ObjectWriter::write(const Ice::OutputStreamPtr& os) const +IceRuby::ObjectWriter::__write(Ice::OutputStream* os) const { Ice::SlicedDataPtr slicedData; @@ -2455,7 +2469,7 @@ IceRuby::ObjectWriter::write(const Ice::OutputStreamPtr& os) const // // Retrieve the SlicedData object that we stored as a hidden member of the Ruby object. // - slicedData = SlicedDataUtil::getMember(_object, const_cast<ObjectMap*>(_map)); + slicedData = StreamUtil::getSlicedDataMember(_object, const_cast<ObjectMap*>(_map)); } os->startObject(slicedData); @@ -2480,7 +2494,13 @@ IceRuby::ObjectWriter::write(const Ice::OutputStreamPtr& os) const } void -IceRuby::ObjectWriter::writeMembers(const Ice::OutputStreamPtr& os, const DataMemberList& members) const +IceRuby::ObjectWriter::__read(Ice::InputStream*) +{ + assert(false); +} + +void +IceRuby::ObjectWriter::writeMembers(Ice::OutputStream* os, const DataMemberList& members) const { for(DataMemberList::const_iterator q = members.begin(); q != members.end(); ++q) { @@ -2488,7 +2508,7 @@ IceRuby::ObjectWriter::writeMembers(const Ice::OutputStreamPtr& os, const DataMe volatile VALUE val = callRuby(rb_ivar_get, _object, member->rubyID); - if(member->optional && (val == Unset || !os->writeOptional(member->tag, member->type->optionalFormat()))) + if(member->optional && (val == Unset || !os->writeOpt(member->tag, member->type->optionalFormat()))) { continue; } @@ -2531,7 +2551,13 @@ IceRuby::ObjectReader::ice_postUnmarshal() } void -IceRuby::ObjectReader::read(const Ice::InputStreamPtr& is) +IceRuby::ObjectReader::__write(Ice::OutputStream*) const +{ + assert(false); +} + +void +IceRuby::ObjectReader::__read(Ice::InputStream* is) { is->startObject(); @@ -2561,7 +2587,7 @@ IceRuby::ObjectReader::read(const Ice::InputStreamPtr& is) for(p = info->optionalMembers.begin(); p != info->optionalMembers.end(); ++p) { DataMemberPtr member = *p; - if(is->readOptional(member->tag, member->type->optionalFormat())) + if(is->readOpt(member->tag, member->type->optionalFormat())) { member->type->unmarshal(is, member, _object, 0, true); } @@ -2581,7 +2607,7 @@ IceRuby::ObjectReader::read(const Ice::InputStreamPtr& is) if(_slicedData) { - SlicedDataUtil* util = reinterpret_cast<SlicedDataUtil*>(is->closure()); + StreamUtil* util = reinterpret_cast<StreamUtil*>(is->getClosure()); assert(util); util->add(this); @@ -2679,7 +2705,7 @@ IceRuby::ReadObjectCallback::invoke(const Ice::ObjectPtr& p) // ExceptionInfo implementation. // VALUE -IceRuby::ExceptionInfo::unmarshal(const Ice::InputStreamPtr& is) +IceRuby::ExceptionInfo::unmarshal(Ice::InputStream* is) { volatile VALUE obj = callRuby(rb_class_new_instance, 0, static_cast<VALUE*>(0), rubyClass); @@ -2702,7 +2728,7 @@ IceRuby::ExceptionInfo::unmarshal(const Ice::InputStreamPtr& is) for(q = info->optionalMembers.begin(); q != info->optionalMembers.end(); ++q) { DataMemberPtr member = *q; - if(is->readOptional(member->tag, member->type->optionalFormat())) + if(is->readOpt(member->tag, member->type->optionalFormat())) { member->type->unmarshal(is, member, obj, 0, true); } @@ -2789,8 +2815,8 @@ IceRuby::ExceptionInfo::printMembers(VALUE value, IceUtilInternal::Output& out, // // ExceptionReader implementation. // -IceRuby::ExceptionReader::ExceptionReader(const Ice::CommunicatorPtr& communicator, const ExceptionInfoPtr& info) : - Ice::UserExceptionReader(communicator), _info(info) +IceRuby::ExceptionReader::ExceptionReader(const ExceptionInfoPtr& info) : + _info(info) { } @@ -2799,27 +2825,12 @@ IceRuby::ExceptionReader::~ExceptionReader() { } -void -IceRuby::ExceptionReader::read(const Ice::InputStreamPtr& is) const -{ - is->startException(); - - const_cast<VALUE&>(_ex) = _info->unmarshal(is); - - const_cast<Ice::SlicedDataPtr&>(_slicedData) = is->endException(_info->preserve); -} - -bool -IceRuby::ExceptionReader::usesClasses() const -{ - return _info->usesClasses; -} - string IceRuby::ExceptionReader::ice_id() const { return _info->id; } + #ifndef ICE_CPP11_MAPPING string IceRuby::ExceptionReader::ice_name() const @@ -2841,6 +2852,28 @@ IceRuby::ExceptionReader::ice_throw() const throw *this; } +void +IceRuby::ExceptionReader::__write(Ice::OutputStream*) const +{ + assert(false); +} + +void +IceRuby::ExceptionReader::__read(Ice::InputStream* is) +{ + is->startException(); + + const_cast<VALUE&>(_ex) = _info->unmarshal(is); + + const_cast<Ice::SlicedDataPtr&>(_slicedData) = is->endException(_info->preserve); +} + +bool +IceRuby::ExceptionReader::__usesClasses() const +{ + return _info->usesClasses; +} + VALUE IceRuby::ExceptionReader::getException() const { diff --git a/ruby/src/IceRuby/Types.h b/ruby/src/IceRuby/Types.h index 934fae0d815..091e4215229 100644 --- a/ruby/src/IceRuby/Types.h +++ b/ruby/src/IceRuby/Types.h @@ -12,7 +12,9 @@ #include <Config.h> #include <Util.h> -#include <Ice/Stream.h> +#include <Ice/FactoryTable.h> +#include <Ice/Object.h> +#include <Ice/SlicedData.h> #include <IceUtil/OutputUtil.h> namespace IceRuby @@ -40,31 +42,6 @@ typedef std::map<VALUE, Ice::ObjectPtr> ObjectMap; class ObjectReader; typedef IceUtil::Handle<ObjectReader> ObjectReaderPtr; -// -// This class keeps track of Ruby objects (instances of Slice classes -// and exceptions) that have preserved slices. -// -class SlicedDataUtil -{ -public: - - SlicedDataUtil(); - ~SlicedDataUtil(); - - void add(const ObjectReaderPtr&); - - void update(); - - static void setMember(VALUE, const Ice::SlicedDataPtr&); - static Ice::SlicedDataPtr getMember(VALUE, ObjectMap*); - -private: - - std::set<ObjectReaderPtr> _readers; - static VALUE _slicedDataType; - static VALUE _sliceInfoType; -}; - struct PrintObjectHistory { int index; @@ -95,6 +72,64 @@ public: typedef IceUtil::Handle<UnmarshalCallback> UnmarshalCallbackPtr; // +// ReadObjectCallback retains all of the information necessary to store an unmarshaled +// Slice value as a Ruby object. +// +class ReadObjectCallback : public IceUtil::Shared +{ +public: + + ReadObjectCallback(const ClassInfoPtr&, const UnmarshalCallbackPtr&, VALUE, void*); + + void invoke(const ::Ice::ObjectPtr&); + +private: + + ClassInfoPtr _info; + UnmarshalCallbackPtr _cb; + VALUE _target; + void* _closure; +}; +typedef IceUtil::Handle<ReadObjectCallback> ReadObjectCallbackPtr; + +// +// This class assists during unmarshaling of Slice classes and exceptions. +// We attach an instance to a stream. +// +class StreamUtil +{ +public: + + StreamUtil(); + ~StreamUtil(); + + // + // Keep a reference to a ReadObjectCallback for patching purposes. + // + void add(const ReadObjectCallbackPtr&); + + // + // Keep track of object instances that have preserved slices. + // + void add(const ObjectReaderPtr&); + + // + // Updated the sliced data information for all stored object instances. + // + void updateSlicedData(); + + static void setSlicedDataMember(VALUE, const Ice::SlicedDataPtr&); + static Ice::SlicedDataPtr getSlicedDataMember(VALUE, ObjectMap*); + +private: + + std::vector<ReadObjectCallbackPtr> _callbacks; + std::set<ObjectReaderPtr> _readers; + static VALUE _slicedDataType; + static VALUE _sliceInfoType; +}; + +// // Base class for type information. // class TypeInfo : public UnmarshalCallback @@ -125,8 +160,8 @@ public: // The marshal and unmarshal functions can raise Ice exceptions, and may raise // AbortMarshaling if an error occurs. // - virtual void marshal(VALUE, const Ice::OutputStreamPtr&, ObjectMap*, bool) = 0; - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, VALUE, void*, bool) = 0; + virtual void marshal(VALUE, Ice::OutputStream*, ObjectMap*, bool) = 0; + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, VALUE, void*, bool) = 0; virtual void print(VALUE, IceUtilInternal::Output&, PrintObjectHistory*) = 0; }; @@ -162,8 +197,8 @@ public: virtual int wireSize() const; virtual Ice::OptionalFormat optionalFormat() const; - virtual void marshal(VALUE, const Ice::OutputStreamPtr&, ObjectMap*, bool); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, VALUE, void*, bool); + virtual void marshal(VALUE, Ice::OutputStream*, ObjectMap*, bool); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, VALUE, void*, bool); virtual void print(VALUE, IceUtilInternal::Output&, PrintObjectHistory*); @@ -192,8 +227,8 @@ public: virtual int wireSize() const; virtual Ice::OptionalFormat optionalFormat() const; - virtual void marshal(VALUE, const Ice::OutputStreamPtr&, ObjectMap*, bool); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, VALUE, void*, bool); + virtual void marshal(VALUE, Ice::OutputStream*, ObjectMap*, bool); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, VALUE, void*, bool); virtual void print(VALUE, IceUtilInternal::Output&, PrintObjectHistory*); @@ -238,8 +273,8 @@ public: virtual bool usesClasses() const; // Default implementation returns false. - virtual void marshal(VALUE, const Ice::OutputStreamPtr&, ObjectMap*, bool); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, VALUE, void*, bool); + virtual void marshal(VALUE, Ice::OutputStream*, ObjectMap*, bool); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, VALUE, void*, bool); virtual void print(VALUE, IceUtilInternal::Output&, PrintObjectHistory*); @@ -276,8 +311,8 @@ public: virtual bool usesClasses() const; // Default implementation returns false. - virtual void marshal(VALUE, const Ice::OutputStreamPtr&, ObjectMap*, bool); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, VALUE, void*, bool); + virtual void marshal(VALUE, Ice::OutputStream*, ObjectMap*, bool); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, VALUE, void*, bool); virtual void unmarshaled(VALUE, VALUE, void*); virtual void print(VALUE, IceUtilInternal::Output&, PrintObjectHistory*); @@ -289,8 +324,8 @@ public: private: - void marshalPrimitiveSequence(const PrimitiveInfoPtr&, VALUE, const Ice::OutputStreamPtr&); - void unmarshalPrimitiveSequence(const PrimitiveInfoPtr&, const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, + void marshalPrimitiveSequence(const PrimitiveInfoPtr&, VALUE, Ice::OutputStream*); + void unmarshalPrimitiveSequence(const PrimitiveInfoPtr&, Ice::InputStream*, const UnmarshalCallbackPtr&, VALUE, void*); }; typedef IceUtil::Handle<SequenceInfo> SequenceInfoPtr; @@ -314,9 +349,9 @@ public: virtual bool usesClasses() const; // Default implementation returns false. - virtual void marshal(VALUE, const Ice::OutputStreamPtr&, ObjectMap*, bool); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, VALUE, void*, bool); - void marshalElement(VALUE, VALUE, const Ice::OutputStreamPtr&, ObjectMap*); + virtual void marshal(VALUE, Ice::OutputStream*, ObjectMap*, bool); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, VALUE, void*, bool); + void marshalElement(VALUE, VALUE, Ice::OutputStream*, ObjectMap*); virtual void unmarshaled(VALUE, VALUE, void*); virtual void print(VALUE, IceUtilInternal::Output&, PrintObjectHistory*); @@ -365,8 +400,8 @@ public: virtual bool usesClasses() const; // Default implementation returns false. - virtual void marshal(VALUE, const Ice::OutputStreamPtr&, ObjectMap*, bool); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, VALUE, void*, bool); + virtual void marshal(VALUE, Ice::OutputStream*, ObjectMap*, bool); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, VALUE, void*, bool); virtual void print(VALUE, IceUtilInternal::Output&, PrintObjectHistory*); @@ -410,8 +445,8 @@ public: virtual int wireSize() const; virtual Ice::OptionalFormat optionalFormat() const; - virtual void marshal(VALUE, const Ice::OutputStreamPtr&, ObjectMap*, bool); - virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, VALUE, void*, bool); + virtual void marshal(VALUE, Ice::OutputStream*, ObjectMap*, bool); + virtual void unmarshal(Ice::InputStream*, const UnmarshalCallbackPtr&, VALUE, void*, bool); virtual void print(VALUE, IceUtilInternal::Output&, PrintObjectHistory*); @@ -431,7 +466,7 @@ class ExceptionInfo : public IceUtil::Shared { public: - VALUE unmarshal(const Ice::InputStreamPtr&); + VALUE unmarshal(Ice::InputStream*); void print(VALUE, IceUtilInternal::Output&); void printMembers(VALUE, IceUtilInternal::Output&, PrintObjectHistory*); @@ -448,7 +483,7 @@ public: // // ObjectWriter wraps a Ruby object for marshaling. // -class ObjectWriter : public Ice::ObjectWriter +class ObjectWriter : public Ice::Object { public: @@ -457,11 +492,12 @@ public: virtual void ice_preMarshal(); - virtual void write(const Ice::OutputStreamPtr&) const; + virtual void __write(Ice::OutputStream*) const; + virtual void __read(Ice::InputStream*); private: - void writeMembers(const Ice::OutputStreamPtr&, const DataMemberList&) const; + void writeMembers(Ice::OutputStream*, const DataMemberList&) const; VALUE _object; ObjectMap* _map; @@ -471,7 +507,7 @@ private: // // ObjectReader unmarshals the state of an Ice object. // -class ObjectReader : public Ice::ObjectReader +class ObjectReader : public Ice::Object { public: @@ -480,7 +516,8 @@ public: virtual void ice_postUnmarshal(); - virtual void read(const Ice::InputStreamPtr&); + virtual void __write(Ice::OutputStream*) const; + virtual void __read(Ice::InputStream*); virtual ClassInfoPtr getInfo() const; @@ -498,16 +535,13 @@ private: // // ExceptionReader creates a Ruby user exception and unmarshals it. // -class ExceptionReader : public Ice::UserExceptionReader +class ExceptionReader : public Ice::UserException { public: - ExceptionReader(const Ice::CommunicatorPtr&, const ExceptionInfoPtr&); + ExceptionReader(const ExceptionInfoPtr&); ~ExceptionReader() throw(); - virtual void read(const Ice::InputStreamPtr&) const; - virtual bool usesClasses() const; - virtual std::string ice_id() const; #ifndef ICE_CPP11_MAPPING ICE_DEPRECATED_API("ice_name() is deprecated, use ice_id() instead.") @@ -516,10 +550,23 @@ public: virtual Ice::UserException* ice_clone() const; virtual void ice_throw() const; + virtual void __write(Ice::OutputStream*) const; + virtual void __read(Ice::InputStream*); + + virtual bool __usesClasses() const; + VALUE getException() const; Ice::SlicedDataPtr getSlicedData() const; + using Ice::UserException::__read; + using Ice::UserException::__write; + +protected: + + virtual void __writeImpl(Ice::OutputStream*) const {} + virtual void __readImpl(Ice::InputStream*) {} + private: ExceptionInfoPtr _info; diff --git a/ruby/src/IceRuby/ValueFactoryManager.cpp b/ruby/src/IceRuby/ValueFactoryManager.cpp new file mode 100644 index 00000000000..ee235bb9272 --- /dev/null +++ b/ruby/src/IceRuby/ValueFactoryManager.cpp @@ -0,0 +1,432 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#include <ValueFactoryManager.h> +#include <Types.h> +#include <Util.h> +#include <Ice/LocalException.h> + +using namespace std; +using namespace IceRuby; + +static VALUE _valueFactoryManagerClass; + +namespace +{ + +ClassInfoPtr +getClassInfo(const string& id) +{ + ClassInfoPtr info; + + if(id == Ice::Object::ice_staticId()) + { + // + // When the ID is that of Ice::Object, it indicates that the stream has not + // found a factory and is providing us an opportunity to preserve the object. + // + info = lookupClassInfo("::Ice::UnknownSlicedObject"); + } + else + { + info = lookupClassInfo(id); + } + + return info; +} + +} + +extern "C" +void +IceRuby_ValueFactoryManager_mark(ValueFactoryManagerPtr* p) +{ + assert(p); + (*p)->mark(); +} + +extern "C" +void +IceRuby_ValueFactoryManager_free(ValueFactoryManagerPtr* p) +{ + assert(p); + delete p; +} + +IceRuby::ValueFactoryManager::ValueFactoryManager() +{ + // + // Create a Ruby wrapper around this object. Note that this is a cyclic reference. + // + _self = Data_Wrap_Struct(_valueFactoryManagerClass, IceRuby_ValueFactoryManager_mark, + IceRuby_ValueFactoryManager_free, new ValueFactoryManagerPtr(this)); + + _defaultFactory = new DefaultValueFactory; +} + +IceRuby::ValueFactoryManager::~ValueFactoryManager() +{ + assert(_factories.empty()); +} + +void +IceRuby::ValueFactoryManager::add(const Ice::ValueFactoryPtr& f, const string& id) +{ + Lock lock(*this); + + if(id.empty()) + { + if(_defaultFactory->getDelegate()) + { + throw Ice::AlreadyRegisteredException(__FILE__, __LINE__, "value factory", id); + } + + _defaultFactory->setDelegate(f); + } + else + { + FactoryMap::iterator p = _factories.find(id); + if(p != _factories.end()) + { + throw Ice::AlreadyRegisteredException(__FILE__, __LINE__, "value factory", id); + } + + _factories.insert(FactoryMap::value_type(id, f)); + } +} + +Ice::ValueFactoryPtr +IceRuby::ValueFactoryManager::find(const string& id) const +{ + Lock lock(*this); + + if(id.empty()) + { + return _defaultFactory; + } + + FactoryMap::const_iterator p = _factories.find(id); + if(p != _factories.end()) + { + return p->second; + } + + return 0; +} + +void +IceRuby::ValueFactoryManager::addValueFactory(VALUE f, const string& id) +{ + ICE_RUBY_TRY + { + add(new FactoryWrapper(f, false), id); + } + ICE_RUBY_CATCH +} + +VALUE +IceRuby::ValueFactoryManager::findValueFactory(const string& id) const +{ + Ice::ValueFactoryPtr f = find(id); + if(f) + { + FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(f); + if(w) + { + return w->getObject(); + } + } + + return Qnil; +} + +void +IceRuby::ValueFactoryManager::addObjectFactory(VALUE f, const string& id) +{ + ICE_RUBY_TRY + { + add(new FactoryWrapper(f, true), id); + } + ICE_RUBY_CATCH +} + +VALUE +IceRuby::ValueFactoryManager::findObjectFactory(const string& id) const +{ + Ice::ValueFactoryPtr f = find(id); + if(f) + { + FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(f); + if(w && w->isObjectFactory()) + { + return w->getObject(); + } + } + + return Qnil; +} + +void +IceRuby::ValueFactoryManager::mark() +{ + Lock lock(*this); + + for(FactoryMap::iterator p = _factories.begin(); p != _factories.end(); ++p) + { + FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(p->second); + if(w) + { + w->mark(); + } + } + + _defaultFactory->mark(); +} + +void +IceRuby::ValueFactoryManager::markSelf() +{ + Lock lock(*this); + + if(!NIL_P(_self)) + { + rb_gc_mark(_self); + } +} + +VALUE +IceRuby::ValueFactoryManager::getObject() const +{ + return _self; +} + +void +IceRuby::ValueFactoryManager::destroy() +{ + FactoryMap factories; + + { + Lock lock(*this); + + factories.swap(_factories); + + _self = Qnil; + } + + for(FactoryMap::iterator p = factories.begin(); p != factories.end(); ++p) + { + FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(p->second); + if(w) + { + w->destroy(); + } + } + + _defaultFactory->destroy(); +} + +IceRuby::FactoryWrapper::FactoryWrapper(VALUE factory, bool isObjectFactory) : + _factory(factory), + _isObjectFactory(isObjectFactory) +{ +} + +Ice::ValuePtr +IceRuby::FactoryWrapper::create(const string& id) +{ + // + // Get the type information. + // + ClassInfoPtr info = getClassInfo(id); + + if(!info) + { + return 0; + } + + // + // Invoke the create method on the Ruby factory object. + // + volatile VALUE str = createString(id); + volatile VALUE obj = callRuby(rb_funcall, _factory, rb_intern("create"), 1, str); + if(NIL_P(obj)) + { + return 0; + } + + return new ObjectReader(obj, info); +} + +VALUE +IceRuby::FactoryWrapper::getObject() const +{ + return _factory; +} + +bool +IceRuby::FactoryWrapper::isObjectFactory() const +{ + return _isObjectFactory; +} + +void +IceRuby::FactoryWrapper::mark() +{ + rb_gc_mark(_factory); +} + +void +IceRuby::FactoryWrapper::destroy() +{ + if(_isObjectFactory) + { + callRuby(rb_funcall, _factory, rb_intern("destroy"), 0); + } +} + +Ice::ValuePtr +IceRuby::DefaultValueFactory::create(const string& id) +{ + Ice::ValuePtr v; + + // + // Give the application-provided default factory a chance to create the object first. + // + if(_delegate) + { + v = _delegate->create(id); + if(v) + { + return v; + } + } + + // + // Get the type information. + // + ClassInfoPtr info = getClassInfo(id); + + if(!info) + { + return 0; + } + + // + // NOTE: We don't do this in Ruby because a generated class can be re-opened to define operations. + // + //// + //// If the requested type is an abstract class, then we give up. + //// + //if(info->isAbstract) + //{ + // return 0; + //} + + // + // Instantiate the object. + // + volatile VALUE obj = callRuby(rb_class_new_instance, 0, reinterpret_cast<VALUE*>(0), info->rubyClass); + assert(!NIL_P(obj)); + return new ObjectReader(obj, info); +} + +void +IceRuby::DefaultValueFactory::setDelegate(const Ice::ValueFactoryPtr& d) +{ + _delegate = d; +} + +VALUE +IceRuby::DefaultValueFactory::getObject() const +{ + if(_delegate) + { + FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(_delegate); + if(w) + { + return w->getObject(); + } + } + + return Qnil; +} + +void +IceRuby::DefaultValueFactory::mark() +{ + if(_delegate) + { + FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(_delegate); + if(w) + { + w->mark(); + } + } +} + +void +IceRuby::DefaultValueFactory::destroy() +{ + if(_delegate) + { + FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(_delegate); + if(w) + { + w->destroy(); + } + } + + _delegate = 0; +} + +extern "C" +VALUE +IceRuby_ValueFactoryManager_add(VALUE self, VALUE factory, VALUE id) +{ + ICE_RUBY_TRY + { + ValueFactoryManagerPtr* p = reinterpret_cast<ValueFactoryManagerPtr*>(DATA_PTR(self)); + assert(p); + + string type = getString(id); + (*p)->addValueFactory(factory, type); + } + ICE_RUBY_CATCH + return Qnil; +} + +extern "C" +VALUE +IceRuby_ValueFactoryManager_find(VALUE self, VALUE id) +{ + ICE_RUBY_TRY + { + ValueFactoryManagerPtr* p = reinterpret_cast<ValueFactoryManagerPtr*>(DATA_PTR(self)); + assert(p); + + string type = getString(id); + return (*p)->findValueFactory(type); + } + ICE_RUBY_CATCH + return Qnil; +} + +bool +IceRuby::initValueFactoryManager(VALUE iceModule) +{ + _valueFactoryManagerClass = rb_define_class_under(iceModule, "ValueFactoryManagerI", rb_cObject); + + // + // Instance methods. + // + rb_define_method(_valueFactoryManagerClass, "add", CAST_METHOD(IceRuby_ValueFactoryManager_add), 2); + rb_define_method(_valueFactoryManagerClass, "find", CAST_METHOD(IceRuby_ValueFactoryManager_find), 1); + + return true; +} diff --git a/ruby/src/IceRuby/ValueFactoryManager.h b/ruby/src/IceRuby/ValueFactoryManager.h new file mode 100644 index 00000000000..d0b79d23528 --- /dev/null +++ b/ruby/src/IceRuby/ValueFactoryManager.h @@ -0,0 +1,100 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_RUBY_OBJECT_FACTORY_H +#define ICE_RUBY_OBJECT_FACTORY_H + +#include <Config.h> +#include <Ice/ValueFactory.h> +#include <IceUtil/Mutex.h> + +namespace IceRuby +{ + +bool initValueFactoryManager(VALUE); + +class FactoryWrapper : public Ice::ValueFactory +{ +public: + + FactoryWrapper(VALUE, bool); + + virtual Ice::ValuePtr create(const std::string&); + + VALUE getObject() const; + + bool isObjectFactory() const; + + void mark(); + + void destroy(); + +protected: + + VALUE _factory; + bool _isObjectFactory; +}; +typedef IceUtil::Handle<FactoryWrapper> FactoryWrapperPtr; + +class DefaultValueFactory : public Ice::ValueFactory +{ +public: + + virtual Ice::ValuePtr create(const std::string&); + + void setDelegate(const Ice::ValueFactoryPtr&); + Ice::ValueFactoryPtr getDelegate() const { return _delegate; } + + VALUE getObject() const; + + void mark(); + + void destroy(); + +private: + + Ice::ValueFactoryPtr _delegate; +}; +typedef IceUtil::Handle<DefaultValueFactory> DefaultValueFactoryPtr; + +class ValueFactoryManager : public Ice::ValueFactoryManager, public IceUtil::Mutex +{ +public: + + ValueFactoryManager(); + ~ValueFactoryManager(); + + virtual void add(const Ice::ValueFactoryPtr&, const std::string&); + virtual Ice::ValueFactoryPtr find(const std::string&) const; + + void addValueFactory(VALUE, const std::string&); + VALUE findValueFactory(const std::string&) const; + void addObjectFactory(VALUE, const std::string&); + VALUE findObjectFactory(const std::string&) const; + + void mark(); + void markSelf(); + + VALUE getObject() const; + + void destroy(); + +private: + + typedef std::map<std::string, Ice::ValueFactoryPtr> FactoryMap; + + VALUE _self; + FactoryMap _factories; + DefaultValueFactoryPtr _defaultFactory; +}; +typedef IceUtil::Handle<ValueFactoryManager> ValueFactoryManagerPtr; + +} + +#endif diff --git a/ruby/test/Ice/exceptions/AllTests.rb b/ruby/test/Ice/exceptions/AllTests.rb index b41430d433c..06becb2a71c 100644 --- a/ruby/test/Ice/exceptions/AllTests.rb +++ b/ruby/test/Ice/exceptions/AllTests.rb @@ -29,9 +29,9 @@ def allTests(communicator) print "testing value factory registration exception... " STDOUT.flush vf = ValueFactoryI.new - communicator.addValueFactory(vf, "x") + communicator.getValueFactoryManager().add(vf, "x") begin - communicator.addValueFactory(vf, "x") + communicator.getValueFactoryManager().add(vf, "x") test(false) rescue Ice::AlreadyRegisteredException end diff --git a/ruby/test/Ice/objects/AllTests.rb b/ruby/test/Ice/objects/AllTests.rb index 9737bce8391..07a0bad65d8 100644 --- a/ruby/test/Ice/objects/AllTests.rb +++ b/ruby/test/Ice/objects/AllTests.rb @@ -55,11 +55,11 @@ end def allTests(communicator) factory = MyValueFactory.new - communicator.addValueFactory(factory, '::Test::B') - communicator.addValueFactory(factory, '::Test::C') - #communicator.addValueFactory(factory, '::Test::D') - communicator.addValueFactory(factory, '::Test::E') - communicator.addValueFactory(factory, '::Test::F') + communicator.getValueFactoryManager().add(factory, '::Test::B') + communicator.getValueFactoryManager().add(factory, '::Test::C') + #communicator.getValueFactoryManager().add(factory, '::Test::D') + communicator.getValueFactoryManager().add(factory, '::Test::E') + communicator.getValueFactoryManager().add(factory, '::Test::F') communicator.addObjectFactory(MyObjectFactory.new, 'TestOF') @@ -282,7 +282,7 @@ def allTests(communicator) print "testing getting ObjectFactory as ValueFactory... " STDOUT.flush - test(communicator.findValueFactory('TestOF') != nil) + test(communicator.getValueFactoryManager().find('TestOF') != nil) puts "ok" return initial diff --git a/slice/Ice/Communicator.ice b/slice/Ice/Communicator.ice index 724994eebf6..73d08e0da2c 100644 --- a/slice/Ice/Communicator.ice +++ b/slice/Ice/Communicator.ice @@ -330,62 +330,11 @@ local interface Communicator * @see ObjectFactory * **/ - ["deprecate:addObjectFactory() is deprecated, use addValueFactory() instead."] + ["deprecate:addObjectFactory() is deprecated, use ValueFactoryManager::add() instead."] void addObjectFactory(ObjectFactory factory, ["objc:param:sliceId"] string id); /** * - * <p>Add a value factory to this communicator. Installing a - * factory with an id for which a factory is already registered - * throws {@link AlreadyRegisteredException}.</p> - * - * <p>When unmarshaling an Ice value, the Ice run time reads the - * most-derived type id off the wire and attempts to create an - * instance of the type using a factory. If no instance is created, - * either because no factory was found, or because all factories - * returned nil, the behavior of the Ice run time depends on the - * format with which the value was marshaled:</p> - * - * <p>If the value uses the "sliced" format, Ice ascends the class - * hierarchy until it finds a type that is recognized by a factory, - * or it reaches the least-derived type. If no factory is found that - * can create an instance, the run time throws - * {@link NoValueFactoryException}.</p> - * - * <p>If the value uses the "compact" format, Ice immediately raises - * {@link NoValueFactoryException}.</p> - * - * <p>The following order is used to locate a factory for a type:</p> - * - * <ol> - * - * <li>The Ice run-time looks for a factory registered - * specifically for the type.</li> - * - * <li>If no instance has been created, the Ice run-time looks - * for the default factory, which is registered with an empty type id. - * </li> - * - * <li>If no instance has been created by any of the preceding - * steps, the Ice run-time looks for a factory that may have been - * statically generated by the language mapping for non-abstract classes. - * </li> - * - * </ol> - * - * @param factory The factory to add. - * - * @param id The type id for which the factory can create instances, or - * an empty string for the default factory. - * - * @see #findValueFactory - * @see ValueFactory - * - **/ - void addValueFactory(ValueFactory factory, ["objc:param:sliceId"] string id); - - /** - * * Find an object factory registered with this communicator. * * @param id The type id for which the factory can create instances, @@ -402,22 +351,6 @@ local interface Communicator ObjectFactory findObjectFactory(string id); /** - * - * Find an value factory registered with this communicator. - * - * @param id The type id for which the factory can create instances, - * or an empty string for the default factory. - * - * @return The value factory, or null if no value factory was - * found for the given id. - * - * @see #addValueFactory - * @see ValueFactory - * - **/ - ["cpp:const"] ValueFactory findValueFactory(string id); - - /** * Get the implicit context associated with this communicator. * * @return The implicit context associated with this communicator; @@ -536,6 +469,17 @@ local interface Communicator /** * + * Get the value factory manager for this communicator. + * + * @return This communicator's value factory manager. + * + * @see ValueFactoryManager + * + **/ + ["cpp:const"] ValueFactoryManager getValueFactoryManager(); + + /** + * * Flush any pending batch requests for this communicator. * This means all batch requests invoked on fixed proxies * for all connections associated with the communicator. diff --git a/slice/Ice/ValueFactory.ice b/slice/Ice/ValueFactory.ice index 0afa62f020f..ab20585b651 100644 --- a/slice/Ice/ValueFactory.ice +++ b/slice/Ice/ValueFactory.ice @@ -18,13 +18,11 @@ module Ice /** * * A factory for values. Value factories are used in several - * places, for example, when receiving "values by value" and + * places, such as when Ice receives a class instance and * when Freeze restores a persistent value. Value factories - * must be implemented by the application writer, and registered + * must be implemented by the application writer and registered * with the communicator. * - * @see Freeze - * **/ ["delegate"] local interface ValueFactory @@ -34,7 +32,7 @@ local interface ValueFactory * Create a new value for a given value type. The type is the * absolute Slice type id, i.e., the id relative to the * unnamed top-level Slice module. For example, the absolute - * Slice type id for interfaces of type <tt>Bar</tt> in the module + * Slice type id for an interface <tt>Bar</tt> in the module * <tt>Foo</tt> is <tt>::Foo::Bar</tt>. * * <p class="Note">The leading "<tt>::</tt>" is required. @@ -48,5 +46,77 @@ local interface ValueFactory Value create(string type); }; +/** + * + * A value factory manager maintains a collection of value factories. + * An application can supply a custom implementation during communicator + * initialization, otherwise Ice provides a default implementation. + * + * @see ValueFactory + * + **/ +local interface ValueFactoryManager +{ + /** + * + * <p>Add a value factory. Attempting to add a + * factory with an id for which a factory is already registered + * throws {@link AlreadyRegisteredException}.</p> + * + * <p>When unmarshaling an Ice value, the Ice run time reads the + * most-derived type id off the wire and attempts to create an + * instance of the type using a factory. If no instance is created, + * either because no factory was found, or because all factories + * returned nil, the behavior of the Ice run time depends on the + * format with which the value was marshaled:</p> + * + * <p>If the value uses the "sliced" format, Ice ascends the class + * hierarchy until it finds a type that is recognized by a factory, + * or it reaches the least-derived type. If no factory is found that + * can create an instance, the run time throws + * {@link NoValueFactoryException}.</p> + * + * <p>If the value uses the "compact" format, Ice immediately raises + * {@link NoValueFactoryException}.</p> + * + * <p>The following order is used to locate a factory for a type:</p> + * + * <ol> + * + * <li>The Ice run-time looks for a factory registered + * specifically for the type.</li> + * + * <li>If no instance has been created, the Ice run-time looks + * for the default factory, which is registered with an empty type id. + * </li> + * + * <li>If no instance has been created by any of the preceding + * steps, the Ice run-time looks for a factory that may have been + * statically generated by the language mapping for non-abstract classes. + * </li> + * + * </ol> + * + * @param factory The factory to add. + * + * @param id The type id for which the factory can create instances, or + * an empty string for the default factory. + * + **/ + void add(ValueFactory factory, ["objc:param:sliceId"] string id); + + /** + * + * Find an value factory registered with this communicator. + * + * @param id The type id for which the factory can create instances, + * or an empty string for the default factory. + * + * @return The value factory, or null if no value factory was + * found for the given id. + * + **/ + ["cpp:const"] ValueFactory find(string id); }; +}; |