Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
in forward declaration replace class keyword when struct is expected
  • Loading branch information
wwmayer committed Dec 29, 2016
1 parent 5fbcb99 commit 35b76c5
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/3rdParty/salomesmesh/inc/MED_Common.hxx
Expand Up @@ -170,7 +170,7 @@ namespace MED{
struct TGaussInfo;
typedef SharedPtr<TGaussInfo> PGaussInfo;

class TGrilleInfo;
struct TGrilleInfo;
typedef SharedPtr<TGrilleInfo> PGrilleInfo;

struct TTimeStampValueBase;
Expand Down
2 changes: 1 addition & 1 deletion src/3rdParty/salomesmesh/inc/MED_GaussDef.hxx
Expand Up @@ -29,7 +29,7 @@

namespace MED
{
class TShapeFun;
struct TShapeFun;
typedef std::vector<double> TDoubleVector;
/*!
* \brief Description of family of integration points
Expand Down
2 changes: 1 addition & 1 deletion src/3rdParty/salomesmesh/inc/SMESH_MAT2d.hxx
Expand Up @@ -45,7 +45,7 @@ namespace SMESH_MAT2d
{
class MedialAxis; // MedialAxis is the entry point
class Branch;
class BranchEnd;
struct BranchEnd;
class Boundary;
struct BoundaryPoint;

Expand Down
2 changes: 1 addition & 1 deletion src/3rdParty/salomesmesh/inc/SMESH_MeshEditor.hxx
Expand Up @@ -51,7 +51,7 @@ class gp_Ax1;
class gp_Vec;
class gp_Pnt;
class SMESH_MesherHelper;
class SMESH_NodeSearcher;
struct SMESH_NodeSearcher;

// ============================================================
/*!
Expand Down
2 changes: 1 addition & 1 deletion src/3rdParty/salomesmesh/inc/SMESH_subMesh.hxx
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Path/libarea/PythonStuff.cpp
Expand Up @@ -25,7 +25,7 @@
#include <Python.h>
#endif

#ifdef __GNUG__
#if defined(__GNUG__) && !defined(__APPLE__)
#pragma implementation
#endif

Expand Down
10 changes: 5 additions & 5 deletions src/Mod/Path/libarea/kurve/kurve.cpp
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand All @@ -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);
}
Expand Down

0 comments on commit 35b76c5

Please sign in to comment.