diff options
| author | tatiana-yan <tatiana.kondakova@gmail.com> | 2019-04-12 15:52:08 +0300 |
|---|---|---|
| committer | mpimenov <mpimenov@users.noreply.github.com> | 2019-04-12 18:30:29 +0300 |
| commit | a685936cae13b6a51028d1db0d023c5ab8ba09ca (patch) | |
| tree | beaa4ed74e5283b4ed7362f6362279ba86f07946 /platform | |
| parent | ce150f2169b1539eda6e845230102c8eca6e4d3a (diff) | |
[std] Use new include style for coding, fixes.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/platform_android.cpp | 8 | ||||
| -rw-r--r-- | platform/platform_ios.mm | 11 |
2 files changed, 12 insertions, 7 deletions
diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp index 659a450f4e..5fcc623e54 100644 --- a/platform/platform_android.cpp +++ b/platform/platform_android.cpp @@ -11,11 +11,15 @@ #include "base/thread.hpp" #include "base/string_utils.hpp" -#include "std/regex.hpp" +#include <memory> +#include <regex> +#include <string> #include <unistd.h> // for sysconf #include <sys/stat.h> +using namespace std; + Platform::Platform() { /// @see initialization routine in android/jni/com/.../Platform.hpp @@ -196,7 +200,7 @@ void Platform::GetFilesByRegExp(string const & directory, string const & regexp, if (ZipFileReader::IsZip(directory)) { // Get files list inside zip file - typedef ZipFileReader::FileListT FilesT; + typedef ZipFileReader::FileList FilesT; FilesT fList; ZipFileReader::FilesList(directory, fList); diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm index f532c5ed96..73c45e0f4e 100644 --- a/platform/platform_ios.mm +++ b/platform/platform_ios.mm @@ -31,6 +31,7 @@ #import <UIKit/UIKit.h> #import <netinet/in.h> +#include <memory> #include <sstream> #include <string> #include <utility> @@ -65,7 +66,7 @@ Platform::Platform() m_tmpDir += "/tmp/"; } - m_guiThread = make_unique<platform::GuiThread>(); + m_guiThread = std::make_unique<platform::GuiThread>(); UIDevice * device = UIDevice.currentDevice; device.batteryMonitoringEnabled = YES; @@ -119,10 +120,10 @@ bool Platform::GetFileSizeByName(std::string const & fileName, uint64_t & size) } } -unique_ptr<ModelReader> Platform::GetReader(std::string const & file, std::string const & searchScope) const +std::unique_ptr<ModelReader> Platform::GetReader(std::string const & file, std::string const & searchScope) const { - return make_unique<FileReader>(ReadPathForFile(file, searchScope), READER_CHUNK_LOG_SIZE, - READER_CHUNK_LOG_COUNT); + return std::make_unique<FileReader>(ReadPathForFile(file, searchScope), READER_CHUNK_LOG_SIZE, + READER_CHUNK_LOG_COUNT); } int Platform::VideoMemoryLimit() const { return 8 * 1024 * 1024; } @@ -255,7 +256,7 @@ void Platform::SetupMeasurementSystem() const settings::Set(settings::kMeasurementUnits, units); } -void Platform::SetGuiThread(unique_ptr<base::TaskLoop> guiThread) +void Platform::SetGuiThread(std::unique_ptr<base::TaskLoop> guiThread) { m_guiThread = std::move(guiThread); } |