From 72cf09d617ed1e7855356f7576ff8584ba6e8167 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Thu, 12 Nov 2015 01:29:58 -0600 Subject: mtp: Address clang compilation errors * Move default value of debug_enabled to declaration * Set more-correct fake values for MtpProperty sets Change-Id: Ife3c15ac6c908848c16a609e8e505336e53c19d8 --- mtp/mtp_MtpDatabase.cpp | 4 ++-- mtp/twrpMtp.cpp | 2 +- mtp/twrpMtp.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'mtp') diff --git a/mtp/mtp_MtpDatabase.cpp b/mtp/mtp_MtpDatabase.cpp index 17053f1de..5eb7d8e61 100755 --- a/mtp/mtp_MtpDatabase.cpp +++ b/mtp/mtp_MtpDatabase.cpp @@ -836,8 +836,8 @@ MtpProperty* MyMtpDatabase::getDevicePropertyDesc(MtpDeviceProperty property) { // get current value // TODO: add actual values - result->setCurrentValue('\0'); - result->setDefaultValue('\0'); + result->setCurrentValue(0); + result->setDefaultValue(0); break; } diff --git a/mtp/twrpMtp.cpp b/mtp/twrpMtp.cpp index d47b8fa0d..2b2de01cd 100755 --- a/mtp/twrpMtp.cpp +++ b/mtp/twrpMtp.cpp @@ -68,7 +68,7 @@ int main(int argc, char* argv[]) { } #endif //def TWRPMTP -twrpMtp::twrpMtp(int debug_enabled = 0) { +twrpMtp::twrpMtp(int debug_enabled) { if (debug_enabled) MtpDebug::enableDebug(); mtpstorages = new storages; diff --git a/mtp/twrpMtp.hpp b/mtp/twrpMtp.hpp index ec7cd4b59..9ad270c72 100755 --- a/mtp/twrpMtp.hpp +++ b/mtp/twrpMtp.hpp @@ -33,7 +33,7 @@ class twrpMtp { public: - twrpMtp(int debug_enabled /* = 0 */); + twrpMtp(int debug_enabled = 0); pthread_t threadserver(void); pid_t forkserver(int mtppipe[2]); void addStorage(std::string display, std::string path, int mtpid, uint64_t maxFileSize); -- cgit v1.2.3