Fix trivial warnings hidden by -isystem
Fix the trivial warnings that are hidden by the use of -isystem to
include frameworks/av and caught by -Werror.
Test: m -j checkbuild
Bug: 31751828
Change-Id: I155f9f772ce0a84b364313814cb7cf528b9de4eb
diff --git a/include/media/CasImpl.h b/include/media/CasImpl.h
index 0dd506c..726f1ce 100644
--- a/include/media/CasImpl.h
+++ b/include/media/CasImpl.h
@@ -27,7 +27,7 @@
using namespace media;
using namespace MediaCas;
using binder::Status;
-class CasPlugin;
+struct CasPlugin;
class SharedLibrary;
class CasImpl : public BnCas {
diff --git a/include/media/DescramblerImpl.h b/include/media/DescramblerImpl.h
index c1c79b3..9f212ac 100644
--- a/include/media/DescramblerImpl.h
+++ b/include/media/DescramblerImpl.h
@@ -24,7 +24,7 @@
using namespace media;
using namespace MediaDescrambler;
using binder::Status;
-class DescramblerPlugin;
+struct DescramblerPlugin;
class SharedLibrary;
class DescramblerImpl : public BnDescrambler {
diff --git a/include/media/VolumeShaper.h b/include/media/VolumeShaper.h
index 1282124..7d76f66 100644
--- a/include/media/VolumeShaper.h
+++ b/include/media/VolumeShaper.h
@@ -32,11 +32,8 @@
#define LOG_TAG "VolumeShaper"
// turn on VolumeShaper logging
-#if 0
-#define VS_LOG ALOGD
-#else
-#define VS_LOG(...)
-#endif
+#define VS_LOGGING 0
+#define VS_LOG(...) ALOGD_IF(VS_LOGGING, __VA_ARGS__)
namespace android {
@@ -90,17 +87,17 @@
Configuration()
: Interpolator<S, T>()
, mType(TYPE_SCALE)
+ , mId(-1)
, mOptionFlags(OPTION_FLAG_NONE)
- , mDurationMs(1000.)
- , mId(-1) {
+ , mDurationMs(1000.) {
}
explicit Configuration(const Configuration &configuration)
: Interpolator<S, T>(*static_cast<const Interpolator<S, T> *>(&configuration))
, mType(configuration.mType)
+ , mId(configuration.mId)
, mOptionFlags(configuration.mOptionFlags)
- , mDurationMs(configuration.mDurationMs)
- , mId(configuration.mId) {
+ , mDurationMs(configuration.mDurationMs) {
}
Type getType() const {