diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-03-18 01:37:51 -0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-03-18 01:37:51 -0800 |
| commit | aa0fcb15afd952144967d873bfc7b86d93973192 (patch) | |
| tree | e657bb26128e8b1ba27353504bdbe7d2b4e3da98 /cpp/src/IceGrid/DescriptorHelper.cpp | |
| parent | Got rid of redundant #ifdef. (Bug 2429.) (diff) | |
| download | ice-aa0fcb15afd952144967d873bfc7b86d93973192.tar.bz2 ice-aa0fcb15afd952144967d873bfc7b86d93973192.tar.xz ice-aa0fcb15afd952144967d873bfc7b86d93973192.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2719
Squashed commit of the following:
commit 5ff1fac3e73ef4fb3ac96a692812a849ff585ebc
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Mar 18 01:27:20 2008 -0800
Fixed the various && || warnings from gcc.
Diffstat (limited to 'cpp/src/IceGrid/DescriptorHelper.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index de5dafdf6f8..b9b81bb1736 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -2876,7 +2876,7 @@ ApplicationHelper::getDistributions(DistributionDescriptor& distribution, } } else if(!_instance.distrib.icepatch.empty() && - (server.empty() && n->second.hasServers() || n->second.hasServer(server))) + ((server.empty() && n->second.hasServers()) || n->second.hasServer(server))) { nodes.push_back(n->first); } |