OSDN Git Service

Use the standard CC_LIKELY and CC_UNLIKELY macros
authorGlenn Kasten <gkasten@google.com>
Thu, 15 Dec 2011 17:51:17 +0000 (09:51 -0800)
committerGlenn Kasten <gkasten@google.com>
Thu, 5 Jan 2012 15:33:45 +0000 (07:33 -0800)
commitf6b1678f8f508b447155a81b44e214475ab634a8
treedabe2858dfed9133c6a270cd6b86877a9d3588b1
parent94023fa6744e24f26f0aba1699ec278649bd66df
Use the standard CC_LIKELY and CC_UNLIKELY macros

Several source files privately defined macros LIKELY and UNLIKELY in terms
of __builtin_expect. But <cutils/compiler.h> already has CC_LIKELY and
CC_UNLIKELY which are intended for this purpose.  So rename the private
uses to use the standard names.

In addition, AudioFlinger was relying on the macro expanding to extra ( ).

Change-Id: I2494e087a0c0cac0ac998335f5e9c8ad02955873
media/libeffects/testlibs/AudioBiquadFilter.cpp
media/libeffects/testlibs/AudioCoefInterpolator.cpp
media/libeffects/testlibs/AudioCommon.h
media/libeffects/testlibs/AudioPeakingFilter.cpp
media/libeffects/testlibs/AudioShelvingFilter.cpp
media/libmedia/AudioRecord.cpp
media/libmedia/AudioTrack.cpp
services/audioflinger/AudioFlinger.cpp
services/audioflinger/AudioFlinger.h
services/audioflinger/AudioMixer.cpp
services/audioflinger/AudioMixer.h