diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 10:24:57 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 10:24:57 +0200 |
| commit | e6f5dc2c89eda44fb0a3d444223131a31867a1b2 (patch) | |
| tree | b6bddfe0a0cccef45484314f47967d95a01472bb /perf/src/Ice/raw/cpp/Server.cpp | |
| parent | more Java changes & tests (diff) | |
| parent | ICE-4804 - Properties and case-mismatch (diff) | |
| download | ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.tar.bz2 ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.tar.xz ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.zip | |
Merge remote-tracking branch 'origin/master' into encoding11
Conflicts:
cpp/include/Ice/Stream.h
cpp/include/Slice/Preprocessor.h
rb/ruby/Makefile.mak
Diffstat (limited to 'perf/src/Ice/raw/cpp/Server.cpp')
| -rw-r--r-- | perf/src/Ice/raw/cpp/Server.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/perf/src/Ice/raw/cpp/Server.cpp b/perf/src/Ice/raw/cpp/Server.cpp index 9ca4b1277c9..3fccab79d42 100644 --- a/perf/src/Ice/raw/cpp/Server.cpp +++ b/perf/src/Ice/raw/cpp/Server.cpp @@ -91,11 +91,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], @@ -111,11 +107,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], |