summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Nosach <ANosach@luxoft.com>2016-02-02 10:14:14 +0200
committerArtem Nosach <ANosach@luxoft.com>2016-02-02 10:14:14 +0200
commitd736fe388337335662fdac6131a4e4e00af476bc (patch)
tree0c5cae2ddec57cc0fe5df380bd0d3a27e5e254d8
parent370a5d117249caa9954e36ab96b23938a9d075e8 (diff)
parentb3a34885c3b3354483e65762a5aad73abd3e7058 (diff)
downloadsdl_core-d736fe388337335662fdac6131a4e4e00af476bc.tar.gz
Merge pull request #359 from LuxoftSDL/hotfix/Fix_build_fail_with_disabled_logging
Fix build fail with disabled logging
-rw-r--r--src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc4
-rw-r--r--src/components/media_manager/include/media_manager/media_manager_impl.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc
index 02d7520ea0..b1ac31b9d8 100644
--- a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc
+++ b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_request.cc
@@ -31,7 +31,7 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-#include <string.h>
+#include <cstring>
#include "application_manager/commands/mobile/perform_audio_pass_thru_request.h"
#include "application_manager/application_manager_impl.h"
#include "application_manager/application_impl.h"
@@ -279,7 +279,7 @@ bool PerformAudioPassThruRequest::IsWhiteSpaceExist() {
for (; it_ip != it_ip_end; ++it_ip) {
str = (*it_ip)[strings::text].asCharArray();
- if (strlen(str) && !CheckSyntax(str)) {
+ if (std::strlen(str) && !CheckSyntax(str)) {
LOG4CXX_ERROR(logger_, "Invalid initial_prompt syntax check failed");
return true;
}
diff --git a/src/components/media_manager/include/media_manager/media_manager_impl.h b/src/components/media_manager/include/media_manager/media_manager_impl.h
index 153ef42050..ebdae7b958 100644
--- a/src/components/media_manager/include/media_manager/media_manager_impl.h
+++ b/src/components/media_manager/include/media_manager/media_manager_impl.h
@@ -34,6 +34,7 @@
#define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_MEDIA_MANAGER_IMPL_H_
#include <string>
+#include <map>
#include "utils/singleton.h"
#include "protocol_handler/protocol_observer.h"
#include "protocol_handler/protocol_handler.h"