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 /cpp/demo/Freeze/bench/Client.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 'cpp/demo/Freeze/bench/Client.cpp')
| -rw-r--r-- | cpp/demo/Freeze/bench/Client.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp index b86979edd16..2b20779bcf4 100644 --- a/cpp/demo/Freeze/bench/Client.cpp +++ b/cpp/demo/Freeze/bench/Client.cpp @@ -166,7 +166,7 @@ private: Freeze::TransactionHolder txHolder(_connection); for(i = 0; i < _repetitions; ++i) { -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1310)) +#if (defined(_MSC_VER) && (_MSC_VER < 1310)) m.put(T::value_type(i, i)); #else m.put(typename T::value_type(i, i)); @@ -269,7 +269,7 @@ private: s2.s = os.str(); s2.s1 = s1; -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1310)) +#if (defined(_MSC_VER) && (_MSC_VER < 1310)) m.put(T::value_type(s1, s2)); #else m.put(typename T::value_type(s1, s2)); @@ -350,7 +350,7 @@ private: ostringstream os; os << i; c1->s = os.str(); -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1310)) +#if (defined(_MSC_VER) && (_MSC_VER < 1310)) m.put(T::value_type(s1, c1)); #else m.put(typename T::value_type(s1, c1)); @@ -425,7 +425,7 @@ private: Freeze::TransactionHolder txHolder(_connection); for(i = 0; i < _repetitions; ++i) { -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1310)) +#if (defined(_MSC_VER) && (_MSC_VER < 1310)) m.put(T::value_type(i, i)); #else m.put(typename T::value_type(i, i)); |