Remove extra semicolons and correct function prototypes for GCC -pedantic ISO compliance option
static const Standard_Real THE_EMPTY_LABEL_WIDTH = 0.0;
static const Standard_ExtCharacter THE_DEGREE_SYMBOL (0x00B0);
static const Standard_Real THE_3D_TEXT_MARGIN = 0.1;
-};
+}
//=======================================================================
//function : Constructor
Standard_Boolean myHasOwnWidth;
public:
- DEFINE_STANDARD_RTTIEXT(AIS_ColoredDrawer,Prs3d_Drawer);
+ DEFINE_STANDARD_RTTIEXT(AIS_ColoredDrawer,Prs3d_Drawer)
};
public:
- DEFINE_STANDARD_RTTIEXT(AIS_ColoredShape,AIS_Shape);
+ DEFINE_STANDARD_RTTIEXT(AIS_ColoredShape,AIS_Shape)
};
namespace
{
static const Standard_ExtCharacter THE_DIAMETER_SYMBOL (0x00D8);
-};
+}
//=======================================================================
//function : Constructor
// default selection priorities
static const Standard_Integer THE_NEUTRAL_SEL_PRIORITY = 5;
static const Standard_Integer THE_LOCAL_SEL_PRIORITY = 6;
-};
+}
//=======================================================================
//function : Constructor
return AIS_Dimension::ComputeMode_All;
}
}
-};
+}
//=======================================================================
//function : Constructor
namespace
{
static const Standard_ExtCharacter THE_RADIUS_SYMBOL ('R');
-};
+}
//=======================================================================
//function : Constructor
public:
//! CASCADE RTTI
- DEFINE_STANDARD_RTTIEXT(AIS_TextLabel,AIS_InteractiveObject);
+ DEFINE_STANDARD_RTTIEXT(AIS_TextLabel,AIS_InteractiveObject)
};
}
}
-};
+}
#endif /* _Aspect_Convert_HeaderFile */
SetColor( AColor1 );
MyColor2 = AColor2;
MyGradientMethod = AMethod;
-};
+}
void Aspect_GradientBackground::SetColors( const Quantity_Color& AColor1,
}
}
} // for (k=0; k<aNbFP; ++k) {
-};
+}
//=======================================================================
// function: MapEdgesAndFaces
// purpose:
//
class BRepCheck_HSC;
-DEFINE_STANDARD_HANDLE(BRepCheck_HSC, MMgt_TShared);
+DEFINE_STANDARD_HANDLE(BRepCheck_HSC, MMgt_TShared)
//=======================================================================
//class : BRepCheck_HSC
//purpose :
//! Other data structures
typedef std::pair<HArray1OfSegments, HBndBox2dTree> SegmentsTree;
typedef NCollection_Array1<SegmentsTree> Array1OfSegmentsTree;
-};
+}
#endif
theLibName += ".so";
#endif
}
-};
+}
//=======================================================================
//function : BRepMesh_DiscretFactory
//! Default flag to control parallelization for BRepMesh_IncrementalMesh
//! tool returned for Mesh Factory
static Standard_Boolean IS_IN_PARALLEL = Standard_False;
-};
+}
//=======================================================================
tmp_file->Remove();
}
-};
+}
// MKV 29.03.05
#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST)
//! isSenseMarker indicates whether to render the
//! sense glyph (arrow) for curves or not
Standard_EXPORT static void Set (const Standard_CString Name, const Handle(Geom_Geometry)& G, const Standard_Boolean isSenseMarker = Standard_True);
-template <class T> static void Set (const Standard_CString Name, const Handle(T)& Arg, typename std::enable_if<std::is_base_of<Geom_Geometry, T>::value>::type * = 0) { Set (Name, (const Handle(Geom_Geometry)&)Arg); };
+template <class T> static void Set (const Standard_CString Name, const Handle(T)& Arg, typename std::enable_if<std::is_base_of<Geom_Geometry, T>::value>::type * = 0) { Set (Name, (const Handle(Geom_Geometry)&)Arg); }
//! Sets <C> in the variable <Name>. Overwrite the
//! variable if already set.
return theSize / Standard_Real(THE_FONT_SIZE) * 72.0 / Standard_Real(THE_RESOLUTION_DPI);
}
-};
+}
// =======================================================================
// function : Constructor
#include <math_Vector.hxx>
#include <Standard_NotImplemented.hxx>
-GProp_SelGProps::GProp_SelGProps(){};
+GProp_SelGProps::GProp_SelGProps(){}
void GProp_SelGProps::SetLocation(const gp_Pnt& SLocation )
{
if (Normal_rot.Crossed(prevNormal).IsOpposite(prevTangent, Precision::Angular()))
angleAT = -angleAT;
return angleAT;
-};
+}
//===============================================================
// Function : ... (OCC78)
// Purpose : This family of functions produce conversion of angle utility
//===============================================================
static Standard_Real corr2PI_PI(Standard_Real Ang){
return Ang = (Ang < M_PI? Ang: Ang-2*M_PI);
-};
+}
static Standard_Real diffAng(Standard_Real A, Standard_Real Ao){
Standard_Real dA = (A-Ao) - Floor((A-Ao)/2.0/M_PI)*2.0*M_PI;
return dA = dA >= 0? corr2PI_PI(dA): -corr2PI_PI(-dA);
-};
+}
//===============================================================
// Function : CalcAngleAT (OCC78)
// Purpose : Calculate angle of rotation of trihedron normal and its derivatives relative
AngP = AngPo + DAng;
};
return AngP;
-};
+}
//===============================================================
// Function : D0
// Purpose :
//=======================================================================
inline Standard_Boolean GeomLib_Interpolate::IsDone() const
-{ return myIsDone ; } ;
+{ return myIsDone ; }
//=======================================================================
//function : Error
//purpose :
Standard_Real aLogRadix = Log10 (anAbsValue) / Log10 (FLT_RADIX);
Standard_Real aExp = Floor (aLogRadix);
return FLT_EPSILON * Pow (FLT_RADIX, aExp);
- };
-};
+ }
+}
// =======================================================================
// function : Graphic3d_Camera
public:
- DEFINE_STANDARD_RTTIEXT(Graphic3d_Camera,Standard_Transient);
+ DEFINE_STANDARD_RTTIEXT(Graphic3d_Camera,Standard_Transient)
};
DEFINE_STANDARD_HANDLE (Graphic3d_Camera, Standard_Transient)
namespace
{
static volatile Standard_Integer THE_CLIP_PLANE_COUNTER = 0;
-};
+}
// =======================================================================
// function : Graphic3d_ClipPlane
public:
- DEFINE_STANDARD_RTTIEXT(Graphic3d_ClipPlane,Standard_Transient);
+ DEFINE_STANDARD_RTTIEXT(Graphic3d_ClipPlane,Standard_Transient)
};
DEFINE_STANDARD_HANDLE (Graphic3d_ClipPlane, Standard_Transient)
namespace
{
static volatile Standard_Integer THE_MARKER_IMAGE_COUNTER = 0;
-};
+}
// =======================================================================
namespace
{
static volatile Standard_Integer THE_SHADER_OBJECT_COUNTER = 0;
-};
+}
// =======================================================================
namespace
{
static volatile Standard_Integer THE_PROGRAM_OBJECT_COUNTER = 0;
-};
+}
// =======================================================================
namespace
{
static volatile Standard_Integer THE_TEXTURE_COUNTER = 0;
-};
+}
// =======================================================================
// function : TexturesFolder
|| theFormat == Image_PixMap::ImgRGBA
|| theFormat == Image_PixMap::ImgBGRA;
}
-};
+}
// =======================================================================
// function : Image_Diff
#include <gp_Pnt.hxx>
#include <IntSurf_PntOn2S.hxx>
-IntSurf_PntOn2S::IntSurf_PntOn2S () : pt(0,0,0),u1(0),v1(0),u2(0),v2(0) {};
+IntSurf_PntOn2S::IntSurf_PntOn2S () : pt(0,0,0),u1(0),v1(0),u2(0),v2(0) {}
void IntSurf_PntOn2S::SetValue (const gp_Pnt& Pt,
const Standard_Boolean OnFirst,
{
return theLeft.Root() < theRight.Root();
}
-};
+}
//=======================================================================
//function : SortRoots
namespace
{
static const Standard_Real PRCANG = Precision::Angular();
-};
+}
//=======================================================================
//function : Intf_InterferencePolygon2d
namespace {
// dummy function for break point
inline void place_for_break_point () {}
-};
+}
//=======================================================================
//function : StandardCallBack
#define fstatvfs fstatfs
#else
#include <sys/statvfs.h>
- int statvfs(const char *, struct statvfs *);
+ #ifdef __GNU_LIBRARY__
+ int statvfs(const char *, struct statvfs *) __THROW;
+ #else
+ int statvfs(const char *, struct statvfs *);
+ #endif
#endif
#ifdef __cplusplus
// otherwise compiler does not leave a place for break point
debug_counter++;
}
-};
+}
//=======================================================================
//function : GetCallback
#include <dlfcn.h>
-extern "C" {size_t strlen (const char* s );}
+#ifdef __GNU_LIBRARY__
+extern "C" { size_t strlen(const char* s) __THROW; }
+#else
+extern "C" { size_t strlen(const char* s); }
+#endif
#define BAD(X) ((X) == NULL)
};
static const TCollection_AsciiString THE_EMPTY_KEY;
-};
+}
// =======================================================================
// function : convertMaterial
{
static const TEL_COLOUR myDefaultColor = {{ 1.0F, 1.0F, 1.0F, 1.0F }};
static const TCollection_AsciiString THE_EMPTY_KEY;
-};
+}
// =======================================================================
// function : OpenGl_AspectLine
{
static const TEL_COLOUR TheDefaultColor = {{ 1.0F, 1.0F, 1.0F, 1.0F }};
static const TCollection_AsciiString THE_EMPTY_KEY;
-};
+}
// =======================================================================
// function : OpenGl_AspectText
5, aParams);
}
-}; // nameless namespace
+} // nameless namespace
// =======================================================================
// function : PushMaterialState
}
#endif
-};
+}
// =======================================================================
// function : OpenGl_Text
{ 0.0F, 0.0F, 0.0F, 1.0F }}
};
-};
+}
// =======================================================================
// function : Init
return 0;
}
-DEFINE_STANDARD_HANDLE(QABugs_VertexFilter, SelectMgr_Filter);
+DEFINE_STANDARD_HANDLE(QABugs_VertexFilter, SelectMgr_Filter)
class QABugs_VertexFilter: public SelectMgr_Filter
{
public:
// The better way is to pass this information via binder or via TopoDS_Shape itself, however,
// this is very specific info to do so...
Standard_Boolean NM_DETECTED = Standard_False;
-};
+}
// ============================================================================
// Method : STEPControl_ActorRead::STEPControl_ActorRead ()
return aRes;
}
-};
+}
#endif // _SelectMgr_VectorTypes_HeaderFile
aPrsGrp->SetGroupPrimitivesAspect (aBoundaryAspect);
aPrsGrp->AddPrimitiveArray (aSegments);
}
-};
+}
// =======================================================================
// function : ExploreSolids
return ok;
}
-Standard_EXPORT Standard_Boolean GLOBAL_btcx = Standard_False;void debtcx(){};
+Standard_EXPORT Standard_Boolean GLOBAL_btcx = Standard_False;void debtcx(){}
Standard_EXPORT void debtcxmess(Standard_Integer f1,Standard_Integer f2,Standard_Integer il)
{cout<<"f1,f2,il : "<<f1<<","<<f2<<","<<il<<endl;cout.flush();debtcx();}
}
return Standard_False;
}
-};
+}
//===============================================================================================
//function : VSetSelectionMode
const Standard_ShortReal theAngle);
DEFINE_STANDARD_RTTI_INLINE(OCC_TextureEnv,Graphic3d_TextureEnv);
};
-DEFINE_STANDARD_HANDLE(OCC_TextureEnv, Graphic3d_TextureEnv);
+DEFINE_STANDARD_HANDLE(OCC_TextureEnv, Graphic3d_TextureEnv)
projects / occt-copy.git / commitdiff