Merge branch 'master' into develop

2022-06-13 14:26:03 +03:00
parent 06e1b613f0 bdf4bfe910
commit 561cc5d010
1 changed files with 1 additions and 0 deletions
--- a/test/hash_complex_test.cpp
+++ b/test/hash_complex_test.cpp
@@ -29,6 +29,7 @@ int main() {}
                                // 'const std::complex<float>::_Ty'
 #pragma warning(disable:4309)   // truncation of constant value
 #pragma warning(disable:4512)   // assignment operator could not be generated
+#pragma warning(disable:4996)   // std::complex<Integer> is deprecated
 #if BOOST_MSVC < 1400
 #pragma warning(disable:4267)   // conversion from 'size_t' to 'unsigned int',
                                // possible loss of data