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 /perf/src/Ice/raw/cpp/Client.cpp | |
| 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 'perf/src/Ice/raw/cpp/Client.cpp')
| -rw-r--r-- | perf/src/Ice/raw/cpp/Client.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/perf/src/Ice/raw/cpp/Client.cpp b/perf/src/Ice/raw/cpp/Client.cpp index 4096deffae0..ba90ddab168 100644 --- a/perf/src/Ice/raw/cpp/Client.cpp +++ b/perf/src/Ice/raw/cpp/Client.cpp @@ -90,11 +90,7 @@ const char closeConnectionMsg = 4; const char magic[] = { 0x49, 0x63, 0x65, 0x50 }; // 'I', 'c', 'e', 'P' -#ifdef __BCPLUSPLUS__ -const char requestHdr[headerSize + sizeof(Ice::Int)] = -#else const char requestHdr[] = -#endif { magic[0], magic[1], @@ -110,11 +106,7 @@ const char requestHdr[] = 0, 0, 0, 0 // Request id (placeholder) }; -#ifdef __BCPLUSPLUS__ -const char requestBatchHdr[headerSize + sizeof(Ice::Int)] = -#else const char requestBatchHdr[] = -#endif { magic[0], magic[1], |