diff options
Diffstat (limited to 'SDL_Core/src/components')
5 files changed, 13 insertions, 12 deletions
diff --git a/SDL_Core/src/components/AppMgr/src/AppMgrCore.cpp b/SDL_Core/src/components/AppMgr/src/AppMgrCore.cpp index 6d58f4c07..4fada341a 100644 --- a/SDL_Core/src/components/AppMgr/src/AppMgrCore.cpp +++ b/SDL_Core/src/components/AppMgr/src/AppMgrCore.cpp @@ -6240,11 +6240,11 @@ namespace NsAppManager hmiApp.set_appId(app->getAppID()); hmiApp.set_isMediaApplication(app->getIsMediaApplication()); - std::map<int,DeviceStorage>::const_iterator it = core->mDevices.find( app->getDeviceHandle() ); + std::map<int,DeviceStorage>::const_iterator dev = core->mDevices.find( app->getDeviceHandle() ); std::string deviceName = ""; - if ( core->mDevices.end() != it ) + if ( core->mDevices.end() != dev ) { - deviceName = it->second.getUserFriendlyName(); + deviceName = dev->second.getUserFriendlyName(); } hmiApp.set_deviceName(deviceName); @@ -6782,8 +6782,8 @@ namespace NsAppManager application->setApplicationHMIStatusLevel(NsSmartDeviceLinkRPCV2::HMILevel::HMI_NONE); mApplications.insert( std::pair<int, Application*>(appId, application) ); - LOG4CPLUS_INFO_EXT(mLogger, "\n\t\t\t\tAdded application with appid " << appId << - " to mApplications " << (int)mApplications[appId]); + //LOG4CPLUS_INFO_EXT(mLogger, "\n\t\t\t\tAdded application with appid " << appId << + // " to mApplications " << (int)mApplications[appId]); for( std::map<int, DeviceStorage>::iterator it = mDevices.begin(); it != mDevices.end(); ++it ) @@ -6850,8 +6850,8 @@ namespace NsAppManager LOG4CPLUS_INFO_EXT(mLogger, "Application created." ); mApplications.insert( std::pair<int, Application*>(appId, application) ); - LOG4CPLUS_INFO_EXT(mLogger, "\n\t\t\t\tAdded application with appid " << appId << - " to mApplications " << (int)mApplications[appId]); + //LOG4CPLUS_INFO_EXT(mLogger, "\n\t\t\t\tAdded application with appid " << appId << + // " to mApplications " << (int)mApplications[appId]); for( std::map<int, DeviceStorage>::iterator it = mDevices.begin(); it != mDevices.end(); ++it ) diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp index 76b116369..d52185f72 100644 --- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp +++ b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.cpp @@ -52,7 +52,7 @@ const AudioCaptureQuality::AudioCaptureQualityInternal AudioCaptureQualityMarsha { if(!s) return AudioCaptureQuality::INVALID_ENUM; - const struct PerfectHashTable* p=AudioCaptureQuality_intHash::getPointer(s,strlen(s)); + const struct PerfectHashTable* p=AudioCaptureQualityV2_intHash::getPointer(s,strlen(s)); return p ? static_cast<AudioCaptureQuality::AudioCaptureQualityInternal>(p->idx) : AudioCaptureQuality::INVALID_ENUM; } diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp index 8ca8e9fc2..1e1a7c7b4 100644 --- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp +++ b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.gp @@ -1,7 +1,7 @@ %language=C++ %struct-type %define lookup-function-name getPointer -%define class-name AudioCaptureQuality_intHash +%define class-name AudioCaptureQualityV2_intHash %omit-struct-type %readonly-tables %compare-strncmp diff --git a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc index 9098c1849..2a9f3e04f 100644 --- a/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc +++ b/SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2/AudioCaptureQualityMarshaller.inc @@ -42,7 +42,7 @@ #define MAX_HASH_VALUE 6 /* maximum key range = 2, duplicates = 0 */ -class AudioCaptureQuality_intHash +class AudioCaptureQualityV2_intHash { private: static inline unsigned int hash (const char *str, unsigned int len); @@ -52,13 +52,13 @@ public: inline /*ARGSUSED*/ unsigned int -AudioCaptureQuality_intHash::hash (register const char *str, register unsigned int len) +AudioCaptureQualityV2_intHash::hash (register const char *str, register unsigned int len) { return len; } const struct NsSmartDeviceLinkRPCV2::PerfectHashTable * -AudioCaptureQuality_intHash::getPointer (register const char *str, register unsigned int len) +AudioCaptureQualityV2_intHash::getPointer (register const char *str, register unsigned int len) { static const unsigned char lengthtable[] = { diff --git a/SDL_Core/src/components/Utils/src/WorkWithOS.cpp b/SDL_Core/src/components/Utils/src/WorkWithOS.cpp index 8bc1cd4e4..46995fcd4 100644 --- a/SDL_Core/src/components/Utils/src/WorkWithOS.cpp +++ b/SDL_Core/src/components/Utils/src/WorkWithOS.cpp @@ -13,6 +13,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <dirent.h> +#include <unistd.h> #include "Utils/WorkWithOS.h" unsigned long int WorkWithOS::getAvailableSpace() |