diff options
| author | 2014-11-17 21:15:30 +0100 | |
|---|---|---|
| committer | 2014-11-24 16:18:15 -0800 | |
| commit | 99d61edfda1f80d13f1f1c96fbec41278f3da709 (patch) | |
| tree | 14233c90399e45c1f6dfc4aebd75d3b117384948 | |
| parent | 613d20668a28f9dc970949c9efd2ca7f61bed6f4 (diff) | |
Fix class vs. struct mismatch
Don't refer to classes as structs and view versa -- causes warnings in
clang (in code built with -Werror)
Change-Id: I4d7f461bcf6fe4e43a14ad2f28ee0e0ddea95abc
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | cmds/bootanimation/AudioPlayer.cpp | 2 | ||||
| -rw-r--r-- | cmds/bootanimation/AudioPlayer.h | 5 | ||||
| -rw-r--r-- | media/jni/android_media_MediaExtractor.h | 2 | ||||
| -rw-r--r-- | media/jni/android_media_MediaHTTPConnection.h | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/cmds/bootanimation/AudioPlayer.cpp b/cmds/bootanimation/AudioPlayer.cpp index ec86afba6ae1..81fe5f85ca9b 100644 --- a/cmds/bootanimation/AudioPlayer.cpp +++ b/cmds/bootanimation/AudioPlayer.cpp @@ -193,7 +193,7 @@ bool AudioPlayer::init(const char* config) return false; } -void AudioPlayer::playFile(struct FileMap* fileMap) { +void AudioPlayer::playFile(FileMap* fileMap) { // stop any currently playing sound requestExitAndWait(); diff --git a/cmds/bootanimation/AudioPlayer.h b/cmds/bootanimation/AudioPlayer.h index 7e82a07bc660..1def0aeac8d1 100644 --- a/cmds/bootanimation/AudioPlayer.h +++ b/cmds/bootanimation/AudioPlayer.h @@ -18,6 +18,7 @@ #define _BOOTANIMATION_AUDIOPLAYER_H #include <utils/Thread.h> +#include <utils/FileMap.h> namespace android { @@ -28,7 +29,7 @@ public: virtual ~AudioPlayer(); bool init(const char* config); - void playFile(struct FileMap* fileMap); + void playFile(FileMap* fileMap); private: virtual bool threadLoop(); @@ -39,7 +40,7 @@ private: int mPeriodSize; int mPeriodCount; - struct FileMap* mCurrentFile; + FileMap* mCurrentFile; }; } // namespace android diff --git a/media/jni/android_media_MediaExtractor.h b/media/jni/android_media_MediaExtractor.h index e5a0c16e3897..9f6250628869 100644 --- a/media/jni/android_media_MediaExtractor.h +++ b/media/jni/android_media_MediaExtractor.h @@ -30,7 +30,7 @@ namespace android { struct IMediaHTTPService; -struct MetaData; +class MetaData; struct NuMediaExtractor; struct JMediaExtractor : public RefBase { diff --git a/media/jni/android_media_MediaHTTPConnection.h b/media/jni/android_media_MediaHTTPConnection.h index 62ff678208f6..f87f1ebb0160 100644 --- a/media/jni/android_media_MediaHTTPConnection.h +++ b/media/jni/android_media_MediaHTTPConnection.h @@ -24,8 +24,8 @@ namespace android { -struct IMemory; -struct MemoryDealer; +class IMemory; +class MemoryDealer; struct JMediaHTTPConnection : public RefBase { enum { |