From 4b7f50caf065b2cb505e1616e40c01323e1d2971 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Tue, 12 Jul 2016 12:26:37 -0700 Subject: [PATCH] Fix google-explicit-constructor warnings in system/media. Declare explicit conversion constructors. Bug: 28341362 Change-Id: I04ef1036731cd0d9d2d96b9dd9f111020b6b9ef5 Test: build with clang-tidy --- audio_utils/include/audio_utils/spdif/SPDIFEncoder.h | 2 +- audio_utils/spdif/AC3FrameScanner.h | 2 +- audio_utils/spdif/BitFieldParser.h | 2 +- brillo/audio/audioservice/brillo_audio_device_info_internal.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio_utils/include/audio_utils/spdif/SPDIFEncoder.h b/audio_utils/include/audio_utils/spdif/SPDIFEncoder.h index 8d8f71ec..b356149d 100644 --- a/audio_utils/include/audio_utils/spdif/SPDIFEncoder.h +++ b/audio_utils/include/audio_utils/spdif/SPDIFEncoder.h @@ -34,7 +34,7 @@ namespace android { class SPDIFEncoder { public: - SPDIFEncoder(audio_format_t format); + explicit SPDIFEncoder(audio_format_t format); // Defaults to AC3 format. Was in original API. SPDIFEncoder(); diff --git a/audio_utils/spdif/AC3FrameScanner.h b/audio_utils/spdif/AC3FrameScanner.h index 7cdba84c..9f3ea576 100644 --- a/audio_utils/spdif/AC3FrameScanner.h +++ b/audio_utils/spdif/AC3FrameScanner.h @@ -35,7 +35,7 @@ namespace android { class AC3FrameScanner : public FrameScanner { public: - AC3FrameScanner(audio_format_t format); + explicit AC3FrameScanner(audio_format_t format); virtual ~AC3FrameScanner(); virtual int getMaxChannels() const { return 5 + 1; } // 5.1 surround diff --git a/audio_utils/spdif/BitFieldParser.h b/audio_utils/spdif/BitFieldParser.h index 1cf45d08..3f6fe595 100644 --- a/audio_utils/spdif/BitFieldParser.h +++ b/audio_utils/spdif/BitFieldParser.h @@ -27,7 +27,7 @@ namespace android { class BitFieldParser { public: - BitFieldParser(uint8_t *data); + explicit BitFieldParser(uint8_t *data); virtual ~BitFieldParser(); /** diff --git a/brillo/audio/audioservice/brillo_audio_device_info_internal.h b/brillo/audio/audioservice/brillo_audio_device_info_internal.h index 0eaaab41..2e60c6fc 100644 --- a/brillo/audio/audioservice/brillo_audio_device_info_internal.h +++ b/brillo/audio/audioservice/brillo_audio_device_info_internal.h @@ -33,7 +33,7 @@ class BAudioDeviceInfoInternal { // // |device_id| is an integer representing an audio device type as defined in // brillo_audio_device_info.h. - BAudioDeviceInfoInternal(int device_id); + explicit BAudioDeviceInfoInternal(int device_id); // Get audio policy config. // -- 2.11.0