diff options
| author | Julius Marchwicki <jmarchwi@ford.com> | 2013-08-19 14:07:11 -0400 |
|---|---|---|
| committer | Julius Marchwicki <jmarchwi@ford.com> | 2013-08-19 14:07:11 -0400 |
| commit | 8504605b01177da2e55bee6abe4c3f20c82da379 (patch) | |
| tree | a5f1b69996c334f556ae6cec7e91af882c6e8db2 /SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2 | |
| parent | d342a0a6894c7ebfcab765e3184c1f4a5769cb8f (diff) | |
| download | smartdevicelink-8504605b01177da2e55bee6abe4c3f20c82da379.tar.gz | |
Added OpenSSL patch and validated against 12.04 64-bitrelease_1.0
Incorporated patch for g++ 4.7 and newer compiler.
Commented out two logging lines preventing compilation on 64-bit targets.
Diffstat (limited to 'SDL_Core/src/components/JSONHandler/src/SDLRPCObjectsImpl/V2')
3 files changed, 5 insertions, 5 deletions
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[] = { |