summaryrefslogtreecommitdiff
path: root/cppe/src/IceE/Connection.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2005-07-06 14:49:47 +0000
committerDwayne Boone <dwayne@zeroc.com>2005-07-06 14:49:47 +0000
commit8e48f2b8c9505ff088a72737dc7216d55732857a (patch)
tree7faaef71bf1a2216bfeb7dd7c0d6cd6e06985ca7 /cppe/src/IceE/Connection.cpp
parentfix shutdown bug. Fix bug with building IceE client side library with (diff)
downloadice-8e48f2b8c9505ff088a72737dc7216d55732857a.tar.bz2
ice-8e48f2b8c9505ff088a72737dc7216d55732857a.tar.xz
ice-8e48f2b8c9505ff088a72737dc7216d55732857a.zip
_NO_ -> _HAS_
Diffstat (limited to 'cppe/src/IceE/Connection.cpp')
-rwxr-xr-xcppe/src/IceE/Connection.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp
index 51fe80eac59..4b5542db74d 100755
--- a/cppe/src/IceE/Connection.cpp
+++ b/cppe/src/IceE/Connection.cpp
@@ -383,7 +383,7 @@ Ice::Connection::sendRequest(BasicStream* os, Outgoing* out)
}
}
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
void
Ice::Connection::prepareBatchRequest(BasicStream* os)
{
@@ -718,7 +718,7 @@ Ice::Connection::Connection(const InstancePtr& instance,
_traceLevels(_instance->traceLevels()), // Cached for better performance.
_warn(_instance->properties()->getPropertyAsInt("IceE.Warn.Connections") > 0),
_requestHdr(headerSize + sizeof(Int), 0),
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
_requestBatchHdr(headerSize + sizeof(Int), 0),
_batchStream(_instance.get()),
_batchStreamInUse(false),
@@ -745,7 +745,7 @@ Ice::Connection::Connection(const InstancePtr& instance,
requestHdr[8] = requestMsg;
requestHdr[9] = 0;
-#ifndef ICEE_NO_BATCH
+#ifdef ICEE_HAS_BATCH
vector<Byte>& requestBatchHdr = const_cast<vector<Byte>&>(_requestBatchHdr);
requestBatchHdr[0] = magic[0];
requestBatchHdr[1] = magic[1];