From 3adf3e2beae67eb5b5d30b857d9e671eb13d2d03 Mon Sep 17 00:00:00 2001 From: vng Date: Tue, 26 Feb 2013 12:26:56 +0300 Subject: [PATCH] Compilation fixes. --- .../jni/com/mapswithme/maps/settings/StoragePathActivity.cpp | 2 +- coding/file_name_utils.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/jni/com/mapswithme/maps/settings/StoragePathActivity.cpp b/android/jni/com/mapswithme/maps/settings/StoragePathActivity.cpp index f51d3a8315..3f6aae019b 100644 --- a/android/jni/com/mapswithme/maps/settings/StoragePathActivity.cpp +++ b/android/jni/com/mapswithme/maps/settings/StoragePathActivity.cpp @@ -35,7 +35,7 @@ extern "C" // Copy all needed files. for (size_t i = 0; i < files.size(); ++i) - if (!my::CopyFile(from + files[i], to + files[i])) + if (!my::CopyFileX(from + files[i], to + files[i])) { // Do the undo - delete all previously copied files. for (size_t j = 0; j <= i; ++j) diff --git a/coding/file_name_utils.cpp b/coding/file_name_utils.cpp index 584162bff6..a6d0f3b344 100644 --- a/coding/file_name_utils.cpp +++ b/coding/file_name_utils.cpp @@ -22,7 +22,7 @@ string GetNativeSeparator() { #ifdef OMIM_OS_WINDOWS return "\\"; -#elif +#else return "/"; #endif; }