diff --git a/src/BOPCol/BOPCol_TBB.hxx b/src/BOPCol/BOPCol_TBB.hxx index 7a3e7179a2..b4b0d9e7cd 100644 --- a/src/BOPCol/BOPCol_TBB.hxx +++ b/src/BOPCol/BOPCol_TBB.hxx @@ -21,6 +21,13 @@ #ifdef HAVE_TBB +// On Windows, function TryEnterCriticalSection has appeared in Windows NT +// and is surrounded by #ifdef in MS VC++ 7.1 headers. +// Thus to use it we need to define appropriate macro saying that we wil +// run on Windows NT 4.0 at least +#if ((defined(_WIN32) || defined(__WIN32__)) && !defined(_WIN32_WINNT)) + #define _WIN32_WINNT 0x0501 +#endif #include using namespace tbb; @@ -28,7 +35,6 @@ using namespace tbb; #define flexible_range blocked_range #define flexible_for parallel_for - #else // not HAVE_TBB #define flexible_range serial_range diff --git a/src/BSplSLib/BSplSLib.cxx b/src/BSplSLib/BSplSLib.cxx index e3d4127378..cc42fe9b37 100755 --- a/src/BSplSLib/BSplSLib.cxx +++ b/src/BSplSLib/BSplSLib.cxx @@ -39,9 +39,6 @@ // for null derivatives static Standard_Real BSplSLib_zero[3] = {0.0, 0.0, 0.0}; -#ifdef WNT -#define M_SQRT2 1.4142135623730950488016887 -#endif //======================================================================= //struct : BSplCLib_DataContainer diff --git a/src/DDF/DDF_IOStream.cxx b/src/DDF/DDF_IOStream.cxx index bb1b70da58..50d8285461 100755 --- a/src/DDF/DDF_IOStream.cxx +++ b/src/DDF/DDF_IOStream.cxx @@ -258,8 +258,7 @@ void DDF_IOStream::ReadExtendedLine(TCollection_ExtendedString& buffer) myIStream->get(c); check++; // if (!(check % 2)) Storage_StreamExtCharParityError::Raise(); - i = 0; j = 0; - i += (Standard_ExtCharacter)c; + i = (Standard_ExtCharacter)c; if (c == '\0') fin = Standard_True; i = (i << 8); @@ -267,7 +266,7 @@ void DDF_IOStream::ReadExtendedLine(TCollection_ExtendedString& buffer) check++; // if ((check % 2) != 0) Storage_StreamExtCharParityError::Raise(); // cout << check << endl; - j += (Standard_ExtCharacter)c; + j = (Standard_ExtCharacter)c; if (c != '\n') fin = Standard_False; i |= (0x00FF & j); buffer += (Standard_ExtCharacter)i; diff --git a/src/FSD/FSD_File.cxx b/src/FSD/FSD_File.cxx index 33c320c919..2d57ecdce3 100755 --- a/src/FSD/FSD_File.cxx +++ b/src/FSD/FSD_File.cxx @@ -237,8 +237,8 @@ void FSD_File::ReadExtendedLine(TCollection_ExtendedString& buffer) if (c == tg[count]) count++; else count = 0; if (count < SIZEOFNORMALEXTENDEDSECTION) { - i = 0; j = 0; - i += (Standard_ExtCharacter)c; + j = 0; + i = (Standard_ExtCharacter)c; if (c == '\0') fin = Standard_True; i = (i << 8); @@ -246,7 +246,7 @@ void FSD_File::ReadExtendedLine(TCollection_ExtendedString& buffer) if (c == tg[count]) count++; else count = 0; if (count < SIZEOFNORMALEXTENDEDSECTION) { - j += (Standard_ExtCharacter)c; + j = (Standard_ExtCharacter)c; if (c != '\n') { fin = Standard_False; i |= (0x00FF & j); diff --git a/src/Graphic3d/Graphic3d_MarkerImage.cxx b/src/Graphic3d/Graphic3d_MarkerImage.cxx index 924cd35602..bd745572cf 100644 --- a/src/Graphic3d/Graphic3d_MarkerImage.cxx +++ b/src/Graphic3d/Graphic3d_MarkerImage.cxx @@ -111,7 +111,9 @@ Handle(TColStd_HArray1OfByte) Graphic3d_MarkerImage::GetBitMapArray (const Stand aBitOn = anAlphaValue > theAlphaValue; } - aBitMap->ChangeValue (aNumOfBytesInRow * aRow + aColumn / 8) += aBitOn ? (0x80 >> (aColumn % 8)) : 0; + Standard_Integer anIndex = aNumOfBytesInRow * aRow + aColumn / 8; + aBitMap->SetValue (anIndex, (Standard_Byte)(aBitMap->Value (anIndex) + + (aBitOn ? (0x80 >> (aColumn % 8)) : 0))); } } diff --git a/src/IGESData/IGESData_IGESWriter.cxx b/src/IGESData/IGESData_IGESWriter.cxx index b62e97ac3e..9c1ab520a2 100755 --- a/src/IGESData/IGESData_IGESWriter.cxx +++ b/src/IGESData/IGESData_IGESWriter.cxx @@ -461,7 +461,7 @@ static void writefnes (Standard_OStream& S, const Standard_CString ligne) char val; for (Standard_Integer i = 0; i < 80; i ++) { if (ligne[i] == '\0') return; - val = ligne[i] ^ (150 + (i & 3)); + val = (char)(ligne[i] ^ (150 + (i & 3))); S << val; } } @@ -487,7 +487,11 @@ Standard_Boolean IGESData_IGESWriter::Print (Standard_OStream& S) const Standard_Integer i; // svv Jan11 2000 : porting on DEC for (i = 0; i < MaxcarsG; i ++) blancs[i] = ' '; blancs[MaxcarsG] = '\0'; - if (fnes) for (i = 0; i < MaxcarsG; i ++) blancs[i] = blancs[i] ^ (150 + (i & 3)); + if (fnes) + { + for (i = 0; i < MaxcarsG; i ++) + blancs[i] = (char)(blancs[i] ^ (150 + (i & 3))); + } if (thesect != 4) Interface_InterfaceError::Raise ("IGESWriter not ready for Print"); diff --git a/src/IGESFile/liriges.c b/src/IGESFile/liriges.c index fd73af2fe6..93cba1b215 100755 --- a/src/IGESFile/liriges.c +++ b/src/IGESFile/liriges.c @@ -70,7 +70,8 @@ int iges_lire (FILE* lefic, int *numsec, char ligne[100], int modefnes) } } if ((ligne[0] & 128)&&modefnes) { - for (i = 0; i < 80; i ++) ligne[i] = ligne[i] ^ (150 + (i & 3)); + for (i = 0; i < 80; i ++) + ligne[i] = (char)(ligne[i] ^ (150 + (i & 3))); } } if (feof(lefic)) return 0; diff --git a/src/ShapeFix/ShapeFix_ComposeShell.cxx b/src/ShapeFix/ShapeFix_ComposeShell.cxx index 9386e96875..9caf50ddc3 100755 --- a/src/ShapeFix/ShapeFix_ComposeShell.cxx +++ b/src/ShapeFix/ShapeFix_ComposeShell.cxx @@ -699,7 +699,7 @@ Standard_Integer ShapeFix_ComposeShell::ComputeCode (const Handle(ShapeExtend_Wi code = IOR_LEFT; myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL2 ); #ifdef DEB - cout << "Warning: ShapeFix_ComposeShell::ComputeCode: lost intersection point" << cout; + cout << "Warning: ShapeFix_ComposeShell::ComputeCode: lost intersection point" << endl; #endif } return code; diff --git a/src/Standard/Standard_GUID.cxx b/src/Standard/Standard_GUID.cxx index f87342f9ae..c4f2b0b4ec 100755 --- a/src/Standard/Standard_GUID.cxx +++ b/src/Standard/Standard_GUID.cxx @@ -357,8 +357,8 @@ Standard_UUID Standard_GUID::ToUUID() const result.Data1 = my32b ; result.Data2 = my16b1 ; result.Data3 = my16b2 ; - result.Data4[0] = my16b3 >> 8 ; - result.Data4[1] = (char ) my16b3 ; + result.Data4[0] = (unsigned char)(my16b3 >> 8); + result.Data4[1] = (char) my16b3; result.Data4[2] = my8b1 ; result.Data4[3] = my8b2 ; result.Data4[4] = my8b3 ; diff --git a/src/Standard/Standard_math.cxx b/src/Standard/Standard_math.cxx index 565ebcab0c..df50e461cf 100755 --- a/src/Standard/Standard_math.cxx +++ b/src/Standard/Standard_math.cxx @@ -16,17 +16,10 @@ // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. -// ------------------------------------------------------------------------- -// Definition des fonctions mathematiques hyperboliques: acosh, asinh, atanh -// pour Windows/NT uniquement. -// ------------------------------------------------------------------------- -#ifdef WNT -#include #include -#ifndef _Standard_MacroHeaderFile -# include -#endif // _Standard_MacroHeaderFile +// MSVC versions prior to 12 did not provided acosh, asinh, atanh functions in standard library +#if defined(_MSC_VER) && (_MSC_VER < 1800) Standard_EXPORT double __cdecl acosh( double X) { @@ -53,4 +46,5 @@ Standard_EXPORT double __cdecl atanh( double X) res = log((1 + X) / (1 - X)) / 2; return res; }; + #endif diff --git a/src/Standard/Standard_math.hxx b/src/Standard/Standard_math.hxx index 3baa6c3a5e..9ab1531892 100755 --- a/src/Standard/Standard_math.hxx +++ b/src/Standard/Standard_math.hxx @@ -20,31 +20,17 @@ #include #endif -#ifdef WNT +#ifdef _MSC_VER -# ifndef __MATH_WNT_H -# define __MATH_WNT_H +#define _USE_MATH_DEFINES +#include +// MSVC versions prior to 12 did not provided acosh, asinh, atanh functions in standard library +#if _MSC_VER < 1800 __Standard_API double __cdecl acosh ( double ); __Standard_API double __cdecl asinh ( double ); __Standard_API double __cdecl atanh ( double ); +#endif -# ifdef M_SQRT1_2 -# undef M_SQRT1_2 -# endif -# define M_SQRT1_2 0.707106781186547524401 - -# ifdef M_PI_2 -# undef M_PI_2 -# endif -# define M_PI_2 1.57079632679489661923 - -# ifdef M_PI -# undef M_PI -# endif -# define M_PI 3.14159265358979323846 - -# endif /* __MATH_WNT_H */ - -#endif /* WNT */ +#endif /* _MSC_VER */ diff --git a/src/TDataStd/TDataStd_Integer.cxx b/src/TDataStd/TDataStd_Integer.cxx index c8d65d1788..e946345707 100755 --- a/src/TDataStd/TDataStd_Integer.cxx +++ b/src/TDataStd/TDataStd_Integer.cxx @@ -147,7 +147,7 @@ Standard_OStream& TDataStd_Integer::Dump (Standard_OStream& anOS) const anOS << myValue; // anOS <<"\nAttribute fields: "; - anOS << TDF_Attribute::Dump(anOS); + TDF_Attribute::Dump(anOS); return anOS; } diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_ProcessFaceInterferences.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_ProcessFaceInterferences.cxx index c9b023c1d7..dc25043cdd 100755 --- a/src/TopOpeBRepDS/TopOpeBRepDS_ProcessFaceInterferences.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_ProcessFaceInterferences.cxx @@ -452,7 +452,11 @@ Standard_Boolean TestTransition(const TopOpeBRepDS_Transition& T,const TopoDS_Fa if(!transok) { cout<<"States found by classifier :"<> (4*k); + v = (unsigned short)(v >> (4*k)); if(v < 10) v |= 0x30; else