[base] Removed the MY_ prefix from the scope guard.

5 files changed, 8 insertions, 8 deletions

diff --git a/coding/coding_tests/file_container_test.cpp b/coding/coding_tests/file_container_test.cpp
index 2ed0b3eb6f..6ffbdb4f60 100644
--- a/coding/coding_tests/file_container_test.cpp
+++ b/coding/coding_tests/file_container_test.cpp
@@ -252,7 +252,7 @@ UNIT_TEST(FilesMappingContainer_MoveHandle)
   string const containerPath = "file_container.tmp";
   string const tagName = "dummy";
 
-  MY_SCOPE_GUARD(deleteContainerFileGuard, bind(&FileWriter::DeleteFileX, cref(containerPath)));
+  SCOPE_GUARD(deleteContainerFileGuard, bind(&FileWriter::DeleteFileX, cref(containerPath)));
 
   {
     FilesContainerW writer(containerPath);
diff --git a/coding/coding_tests/simple_dense_coding_test.cpp b/coding/coding_tests/simple_dense_coding_test.cpp
index a7d7561f54..109a74f188 100644
--- a/coding/coding_tests/simple_dense_coding_test.cpp
+++ b/coding/coding_tests/simple_dense_coding_test.cpp
@@ -32,7 +32,7 @@ UNIT_TEST(SimpleDenseCoding_Smoke)
     data[i] = i;
 
   string const kTestFile = "test.tmp";
-  MY_SCOPE_GUARD(cleanup, bind(&FileWriter::DeleteFileX, kTestFile));
+  SCOPE_GUARD(cleanup, bind(&FileWriter::DeleteFileX, kTestFile));
 
   {
     SimpleDenseCoding coding(data);
diff --git a/coding/serdes_json.hpp b/coding/serdes_json.hpp
index 67639dfac9..c570a84a51 100644
--- a/coding/serdes_json.hpp
+++ b/coding/serdes_json.hpp
@@ -149,7 +149,7 @@ protected:
 
       m_json = std::move(safe_json);
     };
-    MY_SCOPE_GUARD(rollbackJson, rollback);
+    SCOPE_GUARD(rollbackJson, rollback);
 
     fn();
   }
diff --git a/coding/zip_creator.cpp b/coding/zip_creator.cpp
index 189257aa0d..497eee83b4 100644
--- a/coding/zip_creator.cpp
+++ b/coding/zip_creator.cpp
@@ -58,7 +58,7 @@ void CreateTMZip(tm_zip & res)
 bool CreateZipFromPathDeflatedAndDefaultCompression(string const & filePath, string const & zipFilePath)
 {
   // 2. Open zip file for writing.
-  MY_SCOPE_GUARD(outFileGuard, bind(&base::DeleteFileX, cref(zipFilePath)));
+  SCOPE_GUARD(outFileGuard, bind(&base::DeleteFileX, cref(zipFilePath)));
   ZipHandle zip(zipFilePath);
   if (!zip.Handle())
     return false;
diff --git a/coding/zip_reader.cpp b/coding/zip_reader.cpp
index 4a0bf24699..54be8b90cc 100644
--- a/coding/zip_reader.cpp
+++ b/coding/zip_reader.cpp
@@ -48,7 +48,7 @@ ZipFileReader::ZipFileReader(string const & container, string const & file, uint
   if (!zip)
     MYTHROW(OpenZipException, ("Can't get zip file handle", container));
 
-  MY_SCOPE_GUARD(zipGuard, bind(&unzClose, zip));
+  SCOPE_GUARD(zipGuard, bind(&unzClose, zip));
 
   if (UNZ_OK != unzLocateFile(zip, file.c_str(), 1))
     MYTHROW(LocateZipException, ("Can't locate file inside zip", file));
@@ -76,7 +76,7 @@ void ZipFileReader::FilesList(string const & zipContainer, FileListT & filesList
   if (!zip)
     MYTHROW(OpenZipException, ("Can't get zip file handle", zipContainer));
 
-  MY_SCOPE_GUARD(zipGuard, bind(&unzClose, zip));
+  SCOPE_GUARD(zipGuard, bind(&unzClose, zip));
 
   if (UNZ_OK != unzGoToFirstFile(zip))
     MYTHROW(LocateZipException, ("Can't find first file inside zip", zipContainer));
@@ -109,14 +109,14 @@ void ZipFileReader::UnzipFile(string const & zipContainer, string const & fileIn
   unzFile zip = unzOpen64(zipContainer.c_str());
   if (!zip)
     MYTHROW(OpenZipException, ("Can't get zip file handle", zipContainer));
-  MY_SCOPE_GUARD(zipGuard, bind(&unzClose, zip));
+  SCOPE_GUARD(zipGuard, bind(&unzClose, zip));
 
   if (UNZ_OK != unzLocateFile(zip, fileInZip.c_str(), 1))
     MYTHROW(LocateZipException, ("Can't locate file inside zip", fileInZip));
 
   if (UNZ_OK != unzOpenCurrentFile(zip))
     MYTHROW(LocateZipException, ("Can't open file inside zip", fileInZip));
-  MY_SCOPE_GUARD(currentFileGuard, bind(&unzCloseCurrentFile, zip));
+  SCOPE_GUARD(currentFileGuard, bind(&unzCloseCurrentFile, zip));
 
   unz_file_info64 fileInfo;
   if (UNZ_OK != unzGetCurrentFileInfo64(zip, &fileInfo, NULL, 0, NULL, 0, NULL, 0))