OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-07 18:30:55 +03:00
Code Packages Releases Activity

0032009: Coding Rules, TKQADraw - suppress msvc10 compilation warning C4748

Browse Source 
Added a workaround for msvc10 misbehavior.
This commit is contained in:
kgv 2020-12-19 16:00:24 +03:00 committed by bugmaster
parent b2a63f9b6f
commit 41046145c4
2 changed files with 82 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
src/QABugs/QABugs_11.cxx
View File

@ -2388,7 +2388,7 @@ static Standard_Integer OCC6143 (Draw_Interpretor& di, Standard_Integer argc, co
#endif #endif
if(Succes) { if(Succes) {
di << "TestExcept: Successfull completion\n"; di << "TestExcept: Successful completion\n";
} else { } else {
di << "TestExcept: failure\n"; di << "TestExcept: failure\n";
} }
@ -2396,6 +2396,76 @@ static Standard_Integer OCC6143 (Draw_Interpretor& di, Standard_Integer argc, co
return 0; return 0;
} }
//! Auxiliary functor.
struct TestParallelFunctor
{
TestParallelFunctor() : myNbNotRaised (0), myNbSigSegv (0), myNbUnknown (0) {}
Standard_Integer NbNotRaised() const { return myNbNotRaised; }
Standard_Integer NbSigSegv() const { return myNbSigSegv; }
Standard_Integer NbUnknown() const { return myNbUnknown; }
void operator() (int theThreadId, int theTaskId) const
{
(void )theThreadId;
(void )theTaskId;
// Test Access Violation
{
try {
OCC_CATCH_SIGNALS
int* pint = NULL;
*pint = 4;
Standard_Atomic_Increment (&myNbNotRaised);
}
#ifdef _WIN32
catch (OSD_Exception_ACCESS_VIOLATION const&)
#else
catch (OSD_SIGSEGV const&)
#endif
{
Standard_Atomic_Increment (&myNbSigSegv);
}
catch (Standard_Failure const& )
{
Standard_Atomic_Increment (&myNbUnknown);
}
}
}
private:
mutable volatile Standard_Integer myNbNotRaised;
mutable volatile Standard_Integer myNbSigSegv;
mutable volatile Standard_Integer myNbUnknown;
};
static Standard_Integer OCC30775 (Draw_Interpretor& theDI, Standard_Integer theNbArgs, const char** )
{
if (theNbArgs != 1)
{
std::cout << "Syntax error: wrong number of arguments\n";
return 1;
}
Handle(OSD_ThreadPool) aPool = new OSD_ThreadPool (4);
OSD_ThreadPool::Launcher aLauncher (*aPool, 4);
TestParallelFunctor aFunctor;
aLauncher.Perform (0, 100, aFunctor);
theDI << "NbRaised: " << (aFunctor.NbSigSegv() + aFunctor.NbUnknown()) << "\n"
<< "NbNotRaised: " << aFunctor.NbNotRaised() << "\n"
<< "NbSigSeg: " << aFunctor.NbSigSegv() << "\n"
<< "NbUnknown: " << aFunctor.NbUnknown() << "\n";
return 0;
}
#if defined(_MSC_VER) && !defined(__clang__)
#pragma optimize( "", on )
#endif
// try disabling compiler optimizations and function inlining for proper stack
// (VS2010 is skipped due to generation of extra compiler warnings)
#if defined(_MSC_VER) && (_MSC_VER >= 1700) && !defined(__clang__)
#pragma optimize( "", off)
#endif
//! Auxiliary functions for printing synthetic backtrace //! Auxiliary functions for printing synthetic backtrace
class MyTestInterface : public Standard_Transient class MyTestInterface : public Standard_Transient
{ {
@ -2477,70 +2547,8 @@ static Standard_NOINLINE Standard_Integer OCC30762 (Draw_Interpretor& theDI,
} }
return 0; return 0;
} }
#if defined(_MSC_VER) && (_MSC_VER >= 1700) && !defined(__clang__)
//! Auxiliary functor. #pragma optimize( "", on)
struct TestParallelFunctor
{
TestParallelFunctor() : myNbNotRaised (0), myNbSigSegv (0), myNbUnknown (0) {}
Standard_Integer NbNotRaised() const { return myNbNotRaised; }
Standard_Integer NbSigSegv() const { return myNbSigSegv; }
Standard_Integer NbUnknown() const { return myNbUnknown; }
void operator() (int theThreadId, int theTaskId) const
{
(void )theThreadId;
(void )theTaskId;
// Test Access Violation
{
try {
OCC_CATCH_SIGNALS
int* pint = NULL;
*pint = 4;
Standard_Atomic_Increment (&myNbNotRaised);
}
#ifdef _WIN32
catch (OSD_Exception_ACCESS_VIOLATION const&)
#else
catch (OSD_SIGSEGV const&)
#endif
{
Standard_Atomic_Increment (&myNbSigSegv);
}
catch (Standard_Failure const& )
{
Standard_Atomic_Increment (&myNbUnknown);
}
}
}
private:
mutable volatile Standard_Integer myNbNotRaised;
mutable volatile Standard_Integer myNbSigSegv;
mutable volatile Standard_Integer myNbUnknown;
};
static Standard_Integer OCC30775 (Draw_Interpretor& theDI, Standard_Integer theNbArgs, const char** )
{
if (theNbArgs != 1)
{
std::cout << "Syntax error: wrong number of arguments\n";
return 1;
}
Handle(OSD_ThreadPool) aPool = new OSD_ThreadPool (4);
OSD_ThreadPool::Launcher aLauncher (*aPool, 4);
TestParallelFunctor aFunctor;
aLauncher.Perform (0, 100, aFunctor);
theDI << "NbRaised: " << (aFunctor.NbSigSegv() + aFunctor.NbUnknown()) << "\n"
<< "NbNotRaised: " << aFunctor.NbNotRaised() << "\n"
<< "NbSigSeg: " << aFunctor.NbSigSegv() << "\n"
<< "NbUnknown: " << aFunctor.NbUnknown() << "\n";
return 0;
}
#if defined(_MSC_VER) && !defined(__clang__)
#pragma optimize( "", on )
#endif #endif
static TopoDS_Compound AddTestStructure(int nCount_) static TopoDS_Compound AddTestStructure(int nCount_)

12
tests/bugs/fclasses/bug6143
View File

@ -1,15 +1,10 @@
puts "TODO OCC24156 MacOS: Faulty OCC6143" puts "TODO OCC24156 MacOS: Faulty OCC6143"
puts "================" puts "================"
puts "OCC1723" puts "0001723, 0002707, 0006143, 0012131"
puts "OCC2707" puts "OSD::SetSignal : not all FLT e x c e p t i o n s are caught"
puts "OCC6143"
puts "OCC12131"
puts "================" puts "================"
puts "" puts ""
#######################################################################################
# OSD::SetSignal : not all FLT exceptions are caught
#######################################################################################
pload QAcommands pload QAcommands
@ -23,10 +18,9 @@ if { ${IsDone} != 0 } {
puts "result = ${result}" puts "result = ${result}"
puts "Faulty ${BugNumber}" puts "Faulty ${BugNumber}"
} else { } else {
if { [string first "TestExcept: Successfull completion" ${aResult} ] != -1 } { if { [string first "TestExcept: Successful completion" ${aResult} ] != -1 } {
puts "OK ${BugNumber}" puts "OK ${BugNumber}"
} else { } else {
puts "Faulty ${BugNumber}" puts "Faulty ${BugNumber}"
} }
} }