diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2014-11-27 12:08:59 +0100 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2014-11-27 12:17:40 +0100 |
| commit | 2d0ac425564ff9882ebaac5267d1a04d4af67d00 (patch) | |
| tree | 0233791a817ab812f63e4731adf36f03d4dd4dd2 /media/libstagefright/codecs/amrnb/common/src/norm_s.cpp | |
| parent | 1a9c3954a20800dda3d6d18048c7f0edc8c53e6a (diff) | |
| download | frameworks_av-2d0ac425564ff9882ebaac5267d1a04d4af67d00.zip frameworks_av-2d0ac425564ff9882ebaac5267d1a04d4af67d00.tar.gz frameworks_av-2d0ac425564ff9882ebaac5267d1a04d4af67d00.tar.bz2 | |
Fix build with clang in C++11 mode
This removes the deprecated register keyword in many places, fixes one
instance of passing '\0' where a char* is expected, and 2 switch type
narrowing issues.
Change-Id: Ie265ac26ff6a61267ad6406dfe237226d97ca9ac
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Diffstat (limited to 'media/libstagefright/codecs/amrnb/common/src/norm_s.cpp')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/common/src/norm_s.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/amrnb/common/src/norm_s.cpp b/media/libstagefright/codecs/amrnb/common/src/norm_s.cpp index 8cdcdb8..6468b67 100644 --- a/media/libstagefright/codecs/amrnb/common/src/norm_s.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/norm_s.cpp @@ -194,13 +194,13 @@ Word16 norm_s (Word16 var1) ----------------------------------------------------------------------------*/ #if !( defined(PV_ARM_V5) || defined(PV_ARM_GCC_V5) ) -Word16 norm_s(register Word16 var1) +Word16 norm_s(Word16 var1) { /*---------------------------------------------------------------------------- ; Define all local variables ----------------------------------------------------------------------------*/ - register Word16 var_out = 0; + Word16 var_out = 0; /*---------------------------------------------------------------------------- ; Function body here |