diff options
author | YongQin Liu <yongqin.liu@linaro.org> | 2014-04-14 20:16:12 +0530 |
---|---|---|
committer | Amit Pundir <amit.pundir@linaro.org> | 2014-05-08 02:41:19 +0530 |
commit | 363b18cf50b89ab9f61dddea2aba226076b4b112 (patch) | |
tree | 3ff90cd7dfbb4fde0386cdef19495b66a86ffe72 | |
parent | 0ba9bf1942717e1ccd0d1cc243cb4da49f8c036c (diff) | |
download | cts-linaro-juice2-20140507.tar.gz |
fix 64bit build errorslinaro-juice2-20140507
* use format specifier %p instead of %x to print the pointer address.
* instead of long long use int64_t datatype.
Change-Id: Ic37570b07de82f081dde2dd6dca5b33ffb92f44b
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-rw-r--r-- | suite/audio_quality/lib/src/audio/AudioPlaybackLocal.cpp | 6 | ||||
-rw-r--r-- | suite/audio_quality/lib/src/audio/AudioRecordingLocal.cpp | 6 | ||||
-rw-r--r-- | suite/audio_quality/lib/src/task/TaskProcess.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/suite/audio_quality/lib/src/audio/AudioPlaybackLocal.cpp b/suite/audio_quality/lib/src/audio/AudioPlaybackLocal.cpp index fe91cb3b57d..b72211275c1 100644 --- a/suite/audio_quality/lib/src/audio/AudioPlaybackLocal.cpp +++ b/suite/audio_quality/lib/src/audio/AudioPlaybackLocal.cpp @@ -42,12 +42,12 @@ AudioPlaybackLocal::AudioPlaybackLocal(int hwId) : mHwId(hwId), mPcmHandle(NULL) { - LOGV("AudioPlaybackLocal %x", (unsigned int)this); + LOGV("AudioPlaybackLocal %p", this); } AudioPlaybackLocal::~AudioPlaybackLocal() { - LOGV("~AudioPlaybackLocal %x", (unsigned int)this); + LOGV("~AudioPlaybackLocal %p", this); releaseHw(); } @@ -108,7 +108,7 @@ void AudioPlaybackLocal::doStop() void AudioPlaybackLocal::releaseHw() { if (mPcmHandle != NULL) { - LOGV("releaseHw %x", (unsigned int)this); + LOGV("releaseHw %p", this); doStop(); pcm_close(mPcmHandle); mPcmHandle = NULL; diff --git a/suite/audio_quality/lib/src/audio/AudioRecordingLocal.cpp b/suite/audio_quality/lib/src/audio/AudioRecordingLocal.cpp index 1325949b6b4..70b36d12dfc 100644 --- a/suite/audio_quality/lib/src/audio/AudioRecordingLocal.cpp +++ b/suite/audio_quality/lib/src/audio/AudioRecordingLocal.cpp @@ -29,12 +29,12 @@ AudioRecordingLocal::AudioRecordingLocal(int hwId) : mHwId(hwId), mPcmHandle(NULL) { - LOGV("AudioRecordingLocal %x", (unsigned int)this); + LOGV("AudioRecordingLocal %p", this); } AudioRecordingLocal::~AudioRecordingLocal() { - LOGV("~AudioRecordingLocal %x", (unsigned int)this); + LOGV("~AudioRecordingLocal %p", this); releaseHw(); } @@ -97,7 +97,7 @@ void AudioRecordingLocal::doStop() void AudioRecordingLocal::releaseHw() { if (mPcmHandle != NULL) { - LOGV("releaseHw %x", (unsigned int)this); + LOGV("releaseHw %p", this); doStop(); pcm_close(mPcmHandle); mPcmHandle = NULL; diff --git a/suite/audio_quality/lib/src/task/TaskProcess.cpp b/suite/audio_quality/lib/src/task/TaskProcess.cpp index f1e47af6b38..8930e011990 100644 --- a/suite/audio_quality/lib/src/task/TaskProcess.cpp +++ b/suite/audio_quality/lib/src/task/TaskProcess.cpp @@ -271,7 +271,7 @@ bool TaskProcess::parseParams(std::vector<TaskProcess::Param>& list, const char* list.push_back(param); LOGD(" val %s", param.getParamString().string()); } else if (isInput && (StringUtil::compare(item[0], "consti") == 0)) { - long long value = atoll(item[1].string()); + int64_t value = (int64_t)atoll(item[1].string()); TaskCase::Value v(value); Param param(v); list.push_back(param); |