diff --git a/legacy/include/legacy/ie_layers.h b/legacy/include/legacy/ie_layers.h index fcf4270e81f8d8..e8d6a40f3576ad 100644 --- a/legacy/include/legacy/ie_layers.h +++ b/legacy/include/legacy/ie_layers.h @@ -24,7 +24,7 @@ #include "ie_common.h" #include "ie_data.h" -#ifdef _WIN32 +#ifdef _MSC_VER # define _IE_SUPPRESS_DEPRECATED_START_MSVC IE_SUPPRESS_DEPRECATED_START # define _IE_SUPPRESS_DEPRECATED_END_MSVC IE_SUPPRESS_DEPRECATED_END #else diff --git a/src/gna_plugin.cpp b/src/gna_plugin.cpp index 0f8de0bf81947d..552f66fd1d537a 100644 --- a/src/gna_plugin.cpp +++ b/src/gna_plugin.cpp @@ -84,13 +84,6 @@ using namespace ov::intel_gna::memory; using namespace ov::intel_gna::frontend; using namespace ov::intel_gna::pre_post_processing; -namespace InferenceEngine { -template <> -InferenceEngine::TBlob>::~TBlob() { - free(); -} -} // namespace InferenceEngine - template void GNAPlugin::copyInputData(T* dst, const U* src, diff --git a/src/log/debug.hpp b/src/log/debug.hpp index 3c531d74474c8e..04733a406a13ce 100644 --- a/src/log/debug.hpp +++ b/src/log/debug.hpp @@ -26,7 +26,7 @@ #ifdef __PRETTY_FUNCTION__ # undef __PRETTY_FUNCTION__ #endif -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__GNUC__) # define __PRETTY_FUNCTION__ __FUNCSIG__ #else # define __PRETTY_FUNCTION__ __FUNCTION__ diff --git a/tests/deprecated/helpers/tests_common.cpp b/tests/deprecated/helpers/tests_common.cpp index 423adf9f1beb9e..97a7f47faf8956 100644 --- a/tests/deprecated/helpers/tests_common.cpp +++ b/tests/deprecated/helpers/tests_common.cpp @@ -19,9 +19,9 @@ # ifndef _WINSOCK2API_ # define _WINSOCK2API_ # endif -# include -# include -# include "Psapi.h" +# include +# include +# include "psapi.h" #endif static size_t parseLine(char* line) { diff --git a/tests/deprecated/helpers/tests_common.hpp b/tests/deprecated/helpers/tests_common.hpp index f12b39a856fb96..1ed74fb7c1fa0b 100644 --- a/tests/deprecated/helpers/tests_common.hpp +++ b/tests/deprecated/helpers/tests_common.hpp @@ -5,7 +5,9 @@ #pragma once // avoiding clash of the "max" macro with std::max +#ifndef NOMINMAX #define NOMINMAX +#endif #include #include diff --git a/tests/deprecated/readers/ir_reader_v7/ie_cnn_net_reader_impl.cpp b/tests/deprecated/readers/ir_reader_v7/ie_cnn_net_reader_impl.cpp index 6fbb7611734dea..fdee73907d1613 100644 --- a/tests/deprecated/readers/ir_reader_v7/ie_cnn_net_reader_impl.cpp +++ b/tests/deprecated/readers/ir_reader_v7/ie_cnn_net_reader_impl.cpp @@ -79,7 +79,7 @@ void readAllFile(const std::string& string_file_name, void* buffer, size_t maxSi std::string file_name = string_file_name; #endif - inputFile.open(file_name, std::ios::binary | std::ios::in); + inputFile.open(file_name.c_str(), std::ios::binary | std::ios::in); if (!inputFile.is_open()) IE_THROW() << "cannot open file " << string_file_name; if (!inputFile.read(reinterpret_cast(buffer), maxSize)) { diff --git a/tests/deprecated/unit/engines/gna/gna_mock_api.hpp b/tests/deprecated/unit/engines/gna/gna_mock_api.hpp index d38777a2740685..95566ea79ca97f 100644 --- a/tests/deprecated/unit/engines/gna/gna_mock_api.hpp +++ b/tests/deprecated/unit/engines/gna/gna_mock_api.hpp @@ -8,7 +8,7 @@ #include #include -#if defined(_WIN32) +#if defined(_WIN32) || defined(__CYGWIN__) #ifdef libGNAStubs_EXPORTS #define GNA_STUBS_EXPORT __declspec(dllexport) #else