Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--coding/internal/file_data.cpp5
-rw-r--r--platform/platform_tizen.cpp5
-rw-r--r--platform/tizen_string_utils.cpp7
-rw-r--r--tizen/inc/FBase.hpp8
-rw-r--r--tizen/inc/FIo.hpp8
5 files changed, 21 insertions, 12 deletions
diff --git a/coding/internal/file_data.cpp b/coding/internal/file_data.cpp
index f1aef805c5..f3c136e938 100644
--- a/coding/internal/file_data.cpp
+++ b/coding/internal/file_data.cpp
@@ -17,10 +17,7 @@
#endif
#ifdef OMIM_OS_TIZEN
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wignored-qualifiers"
- #include <FIo.h>
-#pragma clang diagnostic pop
+#include "../../tizen/inc/FIo.hpp"
#endif
diff --git a/platform/platform_tizen.cpp b/platform/platform_tizen.cpp
index 62e542888d..69481265ff 100644
--- a/platform/platform_tizen.cpp
+++ b/platform/platform_tizen.cpp
@@ -3,10 +3,7 @@
#include <FAppApp.h>
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wignored-qualifiers"
- #include <FIo.h>
-#pragma clang diagnostic pop
+#include "../../tizen/inc/FIo.hpp"
#include "constants.hpp"
#include "platform_unix_impl.hpp"
diff --git a/platform/tizen_string_utils.cpp b/platform/tizen_string_utils.cpp
index ce1330d2e4..6e24d42bb5 100644
--- a/platform/tizen_string_utils.cpp
+++ b/platform/tizen_string_utils.cpp
@@ -1,9 +1,8 @@
#include "tizen_string_utils.hpp"
#include "../../std/vector.hpp"
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wignored-qualifiers"
- #include <FBase.h>
-#pragma clang diagnostic pop
+
+#include "../../tizen/inc/FBase.hpp"
+
string FromTizenString(Tizen::Base::String const & str_tizen)
{
diff --git a/tizen/inc/FBase.hpp b/tizen/inc/FBase.hpp
new file mode 100644
index 0000000000..6661d9ab02
--- /dev/null
+++ b/tizen/inc/FBase.hpp
@@ -0,0 +1,8 @@
+#pragma once
+#include "../../std/target_os.hpp"
+#ifdef OMIM_OS_TIZEN
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wignored-qualifiers"
+ #include <FBase.h>
+#pragma clang diagnostic pop
+#endif \ No newline at end of file
diff --git a/tizen/inc/FIo.hpp b/tizen/inc/FIo.hpp
new file mode 100644
index 0000000000..aaa7bdbee9
--- /dev/null
+++ b/tizen/inc/FIo.hpp
@@ -0,0 +1,8 @@
+#pragma once
+#include "../../std/target_os.hpp"
+#ifdef OMIM_OS_TIZEN
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wignored-qualifiers"
+ #include <FIo.h>
+#pragma clang diagnostic pop
+#endif \ No newline at end of file