From 42ae41e5a209abc5292cf55fd82eadd7aeee09e9 Mon Sep 17 00:00:00 2001
From: "andrew@webrtc.org"
 <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 25 Jan 2012 19:38:16 +0000
Subject: [PATCH] Fix enumeral comparison error.

TBR=henrike
BUG=
TEST=build on Linux.

Review URL: https://webrtc-codereview.appspot.com/372007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1553 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../source/audio_conference_mixer_impl.cc                | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/src/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
index 6934c522ac..7c982a8a7c 100644
--- a/src/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
+++ b/src/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
@@ -556,10 +556,11 @@ WebRtc_Word32 AudioConferenceMixerImpl::SetMixabilityStatus(
             return -1;
         }
 
-        const int numMixedNonAnonymous = (_participantList.GetSize() <
-            kMaximumAmountOfMixedParticipants) ? _participantList.GetSize() :
-            kMaximumAmountOfMixedParticipants;
-
+        int numMixedNonAnonymous = _participantList.GetSize();
+        if (numMixedNonAnonymous > kMaximumAmountOfMixedParticipants)
+        {
+            numMixedNonAnonymous = kMaximumAmountOfMixedParticipants;
+        }
         numMixedParticipants = numMixedNonAnonymous +
                                _additionalParticipantList.GetSize();
     }