Fix warning abut inexistent warning (#6153)
These warnings are not existing before Visual Studio 2015 Fixes #6151 Co-authored-by: Xavier Bonaventura <xavier.bonaventura@gmail.com> Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
b9bfac0418
commit
64073458bd
@@ -116,7 +116,7 @@ namespace Blender {
|
||||
mywrap arr;
|
||||
};
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#if defined(_MSC_VER) && _MSC_VER < 1900
|
||||
# pragma warning(disable:4351)
|
||||
#endif
|
||||
|
||||
@@ -171,7 +171,7 @@ namespace Blender {
|
||||
// original file data
|
||||
const FileDatabase& db;
|
||||
};
|
||||
#ifdef _MSC_VER
|
||||
#if defined(_MSC_VER) && _MSC_VER < 1900
|
||||
# pragma warning(default:4351)
|
||||
#endif
|
||||
|
||||
|
||||
@@ -174,7 +174,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* Used in code analysis to skip dead paths (e.g. after an assertion evaluated to false).
|
||||
*/
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(disable : 4521 4512 4714 4127 4351 4510)
|
||||
#pragma warning(disable : 4521 4512 4714 4127 4510)
|
||||
#if _MSC_VER < 1900
|
||||
#pragma warning(disable : 4351)
|
||||
#endif
|
||||
#ifdef ASSIMP_BUILD_DLL_EXPORT
|
||||
#pragma warning(disable : 4251)
|
||||
#endif
|
||||
|
||||
@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#pragma GCC system_header
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#if defined(_MSC_VER) && _MSC_VER < 1900
|
||||
#pragma warning(disable : 4351)
|
||||
#endif // _MSC_VER
|
||||
|
||||
|
||||
Reference in New Issue
Block a user