diff --git a/src/3rdParty/salomesmesh/inc/MED_Common.hxx b/src/3rdParty/salomesmesh/inc/MED_Common.hxx index 3f80849ba..4f0486441 100644 --- a/src/3rdParty/salomesmesh/inc/MED_Common.hxx +++ b/src/3rdParty/salomesmesh/inc/MED_Common.hxx @@ -170,7 +170,7 @@ namespace MED{ struct TGaussInfo; typedef SharedPtr PGaussInfo; - class TGrilleInfo; + struct TGrilleInfo; typedef SharedPtr PGrilleInfo; struct TTimeStampValueBase; diff --git a/src/3rdParty/salomesmesh/inc/MED_GaussDef.hxx b/src/3rdParty/salomesmesh/inc/MED_GaussDef.hxx index b5ef03d79..fc92e83f2 100644 --- a/src/3rdParty/salomesmesh/inc/MED_GaussDef.hxx +++ b/src/3rdParty/salomesmesh/inc/MED_GaussDef.hxx @@ -29,7 +29,7 @@ namespace MED { - class TShapeFun; + struct TShapeFun; typedef std::vector TDoubleVector; /*! * \brief Description of family of integration points diff --git a/src/3rdParty/salomesmesh/inc/SMESH_MAT2d.hxx b/src/3rdParty/salomesmesh/inc/SMESH_MAT2d.hxx index 985b46549..e52905f77 100644 --- a/src/3rdParty/salomesmesh/inc/SMESH_MAT2d.hxx +++ b/src/3rdParty/salomesmesh/inc/SMESH_MAT2d.hxx @@ -45,7 +45,7 @@ namespace SMESH_MAT2d { class MedialAxis; // MedialAxis is the entry point class Branch; - class BranchEnd; + struct BranchEnd; class Boundary; struct BoundaryPoint; diff --git a/src/3rdParty/salomesmesh/inc/SMESH_MeshEditor.hxx b/src/3rdParty/salomesmesh/inc/SMESH_MeshEditor.hxx index e5687475a..76da6c893 100644 --- a/src/3rdParty/salomesmesh/inc/SMESH_MeshEditor.hxx +++ b/src/3rdParty/salomesmesh/inc/SMESH_MeshEditor.hxx @@ -51,7 +51,7 @@ class gp_Ax1; class gp_Vec; class gp_Pnt; class SMESH_MesherHelper; -class SMESH_NodeSearcher; +struct SMESH_NodeSearcher; // ============================================================ /*! diff --git a/src/3rdParty/salomesmesh/inc/SMESH_subMesh.hxx b/src/3rdParty/salomesmesh/inc/SMESH_subMesh.hxx index 249784c08..9a51886ed 100644 --- a/src/3rdParty/salomesmesh/inc/SMESH_subMesh.hxx +++ b/src/3rdParty/salomesmesh/inc/SMESH_subMesh.hxx @@ -47,7 +47,7 @@ class SMESH_Hypothesis; class SMESH_Algo; class SMESH_Gen; class SMESH_subMeshEventListener; -class SMESH_subMeshEventListenerData; +struct SMESH_subMeshEventListenerData; class SMESH_subMesh; typedef SMESH_subMeshEventListener EventListener; diff --git a/src/Mod/Path/libarea/PythonStuff.cpp b/src/Mod/Path/libarea/PythonStuff.cpp index ee9068e6d..6cbe1dc1f 100644 --- a/src/Mod/Path/libarea/PythonStuff.cpp +++ b/src/Mod/Path/libarea/PythonStuff.cpp @@ -25,7 +25,7 @@ #include #endif -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma implementation #endif diff --git a/src/Mod/Path/libarea/kurve/kurve.cpp b/src/Mod/Path/libarea/kurve/kurve.cpp index 61d096cda..4bfe93e20 100644 --- a/src/Mod/Path/libarea/kurve/kurve.cpp +++ b/src/Mod/Path/libarea/kurve/kurve.cpp @@ -570,7 +570,7 @@ return; { // add a span (cw = -1 (T) acw = 1 (A) ) #ifdef _DEBUG - if(this == NULL) FAILURE(L"Kurve::Add - No Kurve Object"); + //if(this == NULL) FAILURE(L"Kurve::Add - No Kurve Object"); #endif if(!m_started) { @@ -676,7 +676,7 @@ return; void Kurve::Replace(int vertexnumber, int type, const Point& p0, const Point& pc, int ID) { // replace a span #ifdef _DEBUG - if(this == NULL || vertexnumber > m_nVertices) FAILURE(getMessage(L"Kurve::Replace - vertexNumber out of range")); + if(vertexnumber > m_nVertices) FAILURE(getMessage(L"Kurve::Replace - vertexNumber out of range")); #endif SpanVertex* p = (SpanVertex*) m_spans[vertexnumber / SPANSTORAGE]; p->Add(vertexnumber % SPANSTORAGE, type, p0, pc, ID); @@ -686,20 +686,20 @@ return; void Kurve::ModifyIndex(int vertexnumber, WireExtraData* i) { // replace an index #ifdef _DEBUG - if(this == NULL || vertexnumber > m_nVertices) FAILURE(getMessage(L"Kurve::ModifyIndex - vertexNumber out of range")); + if(vertexnumber > m_nVertices) FAILURE(getMessage(L"Kurve::ModifyIndex - vertexNumber out of range")); #endif SpanVertex* p = (SpanVertex*) m_spans[vertexnumber / SPANSTORAGE]; p->Add(vertexnumber % SPANSTORAGE, i); } #else void Kurve::AddIndex(int vertexNumber, const SpanDataObject* data) { - if(this == NULL || vertexNumber > m_nVertices - 1) FAILURE(L"Kurve::AddIndex - vertexNumber out of range"); + if(vertexNumber > m_nVertices - 1) FAILURE(L"Kurve::AddIndex - vertexNumber out of range"); SpanVertex* p = (SpanVertex*) m_spans[vertexNumber / SPANSTORAGE]; p->Add(vertexNumber % SPANSTORAGE, data); } const SpanDataObject* Kurve::GetIndex(int vertexNumber)const { - if(this == NULL || vertexNumber > m_nVertices - 1) FAILURE(L"Kurve::GetIndex - vertexNumber out of range"); + if(vertexNumber > m_nVertices - 1) FAILURE(L"Kurve::GetIndex - vertexNumber out of range"); SpanVertex* p = (SpanVertex*) m_spans[vertexNumber / SPANSTORAGE]; return p->GetIndex(vertexNumber % SPANSTORAGE); }