diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2014-09-27 17:20:50 +0200 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2014-09-27 17:20:50 +0200 |
| commit | dff843f2fae88c10fe18d2925a4e802a35d74433 (patch) | |
| tree | 3415eacab96ae95004c5857280a363b41aaaf622 | |
| parent | 6cd6792a3289c0c50542d8113068478dbc3a5ad0 (diff) | |
| download | frameworks_av-dff843f2fae88c10fe18d2925a4e802a35d74433.zip frameworks_av-dff843f2fae88c10fe18d2925a4e802a35d74433.tar.gz frameworks_av-dff843f2fae88c10fe18d2925a4e802a35d74433.tar.bz2 | |
Add missing #includes
Some header files in stagefright try to use DISALLOW_EVIL_CONSTRUCTORS
(and even DISALLOW_IMPLICIT_CONSTRUCTORS, which isn't defined anywhere
in stagefright) without including the proper header.
With clang, this results in a build failure - with gcc,
it results in DISALLOW_EVIL_CONSTRUCTORS/DISALLOW_IMPLICIT_CONSTRUCTORS
not doing what they were intended to do, instead appearing as a method
in the DWARF debug sections of files using the headers.
Change-Id: Ie4e99affe98ed8fb1bfcf5ec604c19dcd5311c62
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | include/media/stagefright/AACWriter.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/ClockEstimator.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/MediaMuxer.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/SurfaceMediaSource.h | 4 |
4 files changed, 7 insertions, 2 deletions
diff --git a/include/media/stagefright/AACWriter.h b/include/media/stagefright/AACWriter.h index df1b053..d22707a 100644 --- a/include/media/stagefright/AACWriter.h +++ b/include/media/stagefright/AACWriter.h @@ -17,6 +17,7 @@ #ifndef AAC_WRITER_H_ #define AAC_WRITER_H_ +#include "foundation/ABase.h" #include <media/stagefright/MediaWriter.h> #include <utils/threads.h> diff --git a/include/media/stagefright/ClockEstimator.h b/include/media/stagefright/ClockEstimator.h index 2fd6e75..1455b7f 100644 --- a/include/media/stagefright/ClockEstimator.h +++ b/include/media/stagefright/ClockEstimator.h @@ -19,7 +19,7 @@ #define CLOCK_ESTIMATOR_H_ - +#include "foundation/ABase.h" #include <utils/RefBase.h> #include <utils/Vector.h> diff --git a/include/media/stagefright/MediaMuxer.h b/include/media/stagefright/MediaMuxer.h index ff6a66e..fa2892b 100644 --- a/include/media/stagefright/MediaMuxer.h +++ b/include/media/stagefright/MediaMuxer.h @@ -22,6 +22,8 @@ #include <utils/Vector.h> #include <utils/threads.h> +#include "foundation/ABase.h" + namespace android { struct ABuffer; diff --git a/include/media/stagefright/SurfaceMediaSource.h b/include/media/stagefright/SurfaceMediaSource.h index db5f947..0e3b0c5 100644 --- a/include/media/stagefright/SurfaceMediaSource.h +++ b/include/media/stagefright/SurfaceMediaSource.h @@ -25,6 +25,8 @@ #include <media/stagefright/MediaSource.h> #include <media/stagefright/MediaBuffer.h> +#include "foundation/ABase.h" + namespace android { // ---------------------------------------------------------------------------- @@ -228,7 +230,7 @@ private: Condition mMediaBuffersAvailableCondition; // Avoid copying and equating and default constructor - DISALLOW_IMPLICIT_CONSTRUCTORS(SurfaceMediaSource); + DISALLOW_EVIL_CONSTRUCTORS(SurfaceMediaSource); }; // ---------------------------------------------------------------------------- |