From aa0fcb15afd952144967d873bfc7b86d93973192 Mon Sep 17 00:00:00 2001 From: Matthew Newhook Date: Tue, 18 Mar 2008 01:37:51 -0800 Subject: http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2719 Squashed commit of the following: commit 5ff1fac3e73ef4fb3ac96a692812a849ff585ebc Author: Matthew Newhook Date: Tue Mar 18 01:27:20 2008 -0800 Fixed the various && || warnings from gcc. --- cpp/src/IceGrid/DescriptorHelper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpp/src/IceGrid/DescriptorHelper.cpp') 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); } -- cgit v1.2.3