diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
| commit | 7047b953adab26c7098cbfaea2b69f9d36231cd3 (patch) | |
| tree | 8668c830838184ebc465554b85c085da42fb6f6a /cpp/include/Ice/Outgoing.h | |
| parent | Missing files (diff) | |
| parent | Removed Stream::format method, replace with startWriteEncaps parameter (diff) | |
| download | ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.bz2 ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.xz ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/Ice/.depend
cpp/src/Ice/.depend.mak
cpp/src/slice2cpp/Gen.cpp
Diffstat (limited to 'cpp/include/Ice/Outgoing.h')
| -rw-r--r-- | cpp/include/Ice/Outgoing.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h index cf2dfac20ff..0f4abee7487 100644 --- a/cpp/include/Ice/Outgoing.h +++ b/cpp/include/Ice/Outgoing.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_OUTGOING_H -#define ICE_OUTGOING_H +#pragma once #include <IceUtil/Mutex.h> #include <IceUtil/Monitor.h> @@ -107,9 +106,9 @@ public: _is.readEncaps(encaps, sz); } - BasicStream* startWriteParams() + BasicStream* startWriteParams(Ice::FormatType format) { - _os.startWriteEncaps(_encoding); + _os.startWriteEncaps(_encoding, format); return &_os; } void endWriteParams() @@ -201,5 +200,3 @@ private: }; } - -#endif |