From a3f6f591fcb2ebeb7b437ea35f162966ab5517cb Mon Sep 17 00:00:00 2001 From: Jacob Abel Date: Thu, 21 Jan 2016 16:28:38 -0800 Subject: [PATCH] 0027105: Make code ISO-compliant [-Wpedantic fixes] Remove extra semicolons and correct function prototypes for GCC -pedantic ISO compliance option --- src/AIS/AIS_AngleDimension.cxx | 2 +- src/AIS/AIS_ColoredShape.hxx | 4 ++-- src/AIS/AIS_DiameterDimension.cxx | 2 +- src/AIS/AIS_Dimension.cxx | 2 +- src/AIS/AIS_DimensionOwner.cxx | 2 +- src/AIS/AIS_RadiusDimension.cxx | 2 +- src/AIS/AIS_TextLabel.hxx | 2 +- src/Aspect/Aspect_Convert.hxx | 2 +- src/Aspect/Aspect_GradientBackground.cxx | 2 +- src/BOPAlgo/BOPAlgo_Builder_3.cxx | 2 +- src/BRepCheck/BRepCheck_Solid.cxx | 2 +- src/BRepMesh/BRepMesh.hxx | 2 +- src/BRepMesh/BRepMesh_DiscretFactory.cxx | 2 +- src/BRepMesh/BRepMesh_IncrementalMesh.cxx | 2 +- src/Draw/Draw_Interpretor.cxx | 2 +- src/DrawTrSurf/DrawTrSurf.hxx | 2 +- src/Font/Font_BRepFont.cxx | 2 +- src/Font/Font_FontMgr.cxx | 2 +- src/GProp/GProp_SelGProps.cxx | 2 +- src/GeomFill/GeomFill_CorrectedFrenet.cxx | 8 ++++---- src/GeomLib/GeomLib_Interpolate.lxx | 2 +- src/Graphic3d/Graphic3d_Camera.cxx | 4 ++-- src/Graphic3d/Graphic3d_Camera.hxx | 2 +- src/Graphic3d/Graphic3d_ClipPlane.cxx | 2 +- src/Graphic3d/Graphic3d_ClipPlane.hxx | 2 +- src/Graphic3d/Graphic3d_MarkerImage.cxx | 2 +- src/Graphic3d/Graphic3d_ShaderObject.cxx | 2 +- src/Graphic3d/Graphic3d_ShaderProgram.cxx | 2 +- src/Graphic3d/Graphic3d_TextureRoot.cxx | 2 +- src/Image/Image_Diff.cxx | 2 +- src/IntSurf/IntSurf_PntOn2S.cxx | 2 +- src/IntTools/IntTools.cxx | 2 +- src/Intf/Intf_InterferencePolygon2d.cxx | 2 +- src/NCollection/NCollection_BaseAllocator.cxx | 2 +- src/OSD/OSD_Disk.cxx | 6 +++++- src/OSD/OSD_MAllocHook.cxx | 2 +- src/OSD/OSD_SharedLibrary.cxx | 6 +++++- src/OpenGl/OpenGl_AspectFace.cxx | 2 +- src/OpenGl/OpenGl_AspectLine.cxx | 2 +- src/OpenGl/OpenGl_AspectText.cxx | 2 +- src/OpenGl/OpenGl_ShaderManager.cxx | 2 +- src/OpenGl/OpenGl_Text.cxx | 2 +- src/OpenGl/OpenGl_Workspace.cxx | 2 +- src/QABugs/QABugs_19.cxx | 2 +- src/STEPControl/STEPControl_ActorRead.cxx | 2 +- src/SelectMgr/SelectMgr_VectorTypes.hxx | 2 +- src/StdPrs/StdPrs_ShadedShape.cxx | 2 +- src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx | 2 +- src/ViewerTest/ViewerTest_ObjectCommands.cxx | 2 +- src/ViewerTest/ViewerTest_ViewerCommands.cxx | 2 +- 50 files changed, 63 insertions(+), 55 deletions(-) diff --git a/src/AIS/AIS_AngleDimension.cxx b/src/AIS/AIS_AngleDimension.cxx index a5be546ae8..a9596edc39 100644 --- a/src/AIS/AIS_AngleDimension.cxx +++ b/src/AIS/AIS_AngleDimension.cxx @@ -61,7 +61,7 @@ namespace 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 diff --git a/src/AIS/AIS_ColoredShape.hxx b/src/AIS/AIS_ColoredShape.hxx index 1c74296eec..af37a86b2b 100644 --- a/src/AIS/AIS_ColoredShape.hxx +++ b/src/AIS/AIS_ColoredShape.hxx @@ -54,7 +54,7 @@ public: //! @name list of overridden properties Standard_Boolean myHasOwnWidth; public: - DEFINE_STANDARD_RTTIEXT(AIS_ColoredDrawer,Prs3d_Drawer); + DEFINE_STANDARD_RTTIEXT(AIS_ColoredDrawer,Prs3d_Drawer) }; @@ -175,7 +175,7 @@ protected: public: - DEFINE_STANDARD_RTTIEXT(AIS_ColoredShape,AIS_Shape); + DEFINE_STANDARD_RTTIEXT(AIS_ColoredShape,AIS_Shape) }; diff --git a/src/AIS/AIS_DiameterDimension.cxx b/src/AIS/AIS_DiameterDimension.cxx index 495a82c733..0d679da64e 100644 --- a/src/AIS/AIS_DiameterDimension.cxx +++ b/src/AIS/AIS_DiameterDimension.cxx @@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(AIS_DiameterDimension,AIS_Dimension) namespace { static const Standard_ExtCharacter THE_DIAMETER_SYMBOL (0x00D8); -}; +} //======================================================================= //function : Constructor diff --git a/src/AIS/AIS_Dimension.cxx b/src/AIS/AIS_Dimension.cxx index c77d1f3250..1aba01e8f3 100755 --- a/src/AIS/AIS_Dimension.cxx +++ b/src/AIS/AIS_Dimension.cxx @@ -90,7 +90,7 @@ namespace // default selection priorities static const Standard_Integer THE_NEUTRAL_SEL_PRIORITY = 5; static const Standard_Integer THE_LOCAL_SEL_PRIORITY = 6; -}; +} //======================================================================= //function : Constructor diff --git a/src/AIS/AIS_DimensionOwner.cxx b/src/AIS/AIS_DimensionOwner.cxx index 81094b684a..1b3c368b78 100755 --- a/src/AIS/AIS_DimensionOwner.cxx +++ b/src/AIS/AIS_DimensionOwner.cxx @@ -42,7 +42,7 @@ namespace return AIS_Dimension::ComputeMode_All; } } -}; +} //======================================================================= //function : Constructor diff --git a/src/AIS/AIS_RadiusDimension.cxx b/src/AIS/AIS_RadiusDimension.cxx index 016bee560b..b1114e9181 100644 --- a/src/AIS/AIS_RadiusDimension.cxx +++ b/src/AIS/AIS_RadiusDimension.cxx @@ -27,7 +27,7 @@ IMPLEMENT_STANDARD_RTTIEXT(AIS_RadiusDimension,AIS_Dimension) namespace { static const Standard_ExtCharacter THE_RADIUS_SYMBOL ('R'); -}; +} //======================================================================= //function : Constructor diff --git a/src/AIS/AIS_TextLabel.hxx b/src/AIS/AIS_TextLabel.hxx index 5289c6c9fa..33cd6d7a85 100644 --- a/src/AIS/AIS_TextLabel.hxx +++ b/src/AIS/AIS_TextLabel.hxx @@ -115,7 +115,7 @@ protected: public: //! CASCADE RTTI - DEFINE_STANDARD_RTTIEXT(AIS_TextLabel,AIS_InteractiveObject); + DEFINE_STANDARD_RTTIEXT(AIS_TextLabel,AIS_InteractiveObject) }; diff --git a/src/Aspect/Aspect_Convert.hxx b/src/Aspect/Aspect_Convert.hxx index 4b30fd0c5f..9ba492443d 100644 --- a/src/Aspect/Aspect_Convert.hxx +++ b/src/Aspect/Aspect_Convert.hxx @@ -81,6 +81,6 @@ namespace Aspect_Convert } } -}; +} #endif /* _Aspect_Convert_HeaderFile */ diff --git a/src/Aspect/Aspect_GradientBackground.cxx b/src/Aspect/Aspect_GradientBackground.cxx index e228c0a742..aa49d0ac3c 100644 --- a/src/Aspect/Aspect_GradientBackground.cxx +++ b/src/Aspect/Aspect_GradientBackground.cxx @@ -33,7 +33,7 @@ Aspect_GradientBackground::Aspect_GradientBackground( const Quantity_Color& ACol SetColor( AColor1 ); MyColor2 = AColor2; MyGradientMethod = AMethod; -}; +} void Aspect_GradientBackground::SetColors( const Quantity_Color& AColor1, diff --git a/src/BOPAlgo/BOPAlgo_Builder_3.cxx b/src/BOPAlgo/BOPAlgo_Builder_3.cxx index d7438acbac..536afb91da 100644 --- a/src/BOPAlgo/BOPAlgo_Builder_3.cxx +++ b/src/BOPAlgo/BOPAlgo_Builder_3.cxx @@ -358,7 +358,7 @@ void BOPAlgo_FillIn3DParts::Perform() } } } // for (k=0; k SegmentsTree; typedef NCollection_Array1 Array1OfSegmentsTree; -}; +} #endif diff --git a/src/BRepMesh/BRepMesh_DiscretFactory.cxx b/src/BRepMesh/BRepMesh_DiscretFactory.cxx index c54c2a95cf..50e7d5877a 100644 --- a/src/BRepMesh/BRepMesh_DiscretFactory.cxx +++ b/src/BRepMesh/BRepMesh_DiscretFactory.cxx @@ -45,7 +45,7 @@ namespace theLibName += ".so"; #endif } -}; +} //======================================================================= //function : BRepMesh_DiscretFactory diff --git a/src/BRepMesh/BRepMesh_IncrementalMesh.cxx b/src/BRepMesh/BRepMesh_IncrementalMesh.cxx index 55873a710d..c3f9d42f14 100644 --- a/src/BRepMesh/BRepMesh_IncrementalMesh.cxx +++ b/src/BRepMesh/BRepMesh_IncrementalMesh.cxx @@ -60,7 +60,7 @@ namespace //! Default flag to control parallelization for BRepMesh_IncrementalMesh //! tool returned for Mesh Factory static Standard_Boolean IS_IN_PARALLEL = Standard_False; -}; +} //======================================================================= diff --git a/src/Draw/Draw_Interpretor.cxx b/src/Draw/Draw_Interpretor.cxx index ba6335b5fa..776bcf366e 100644 --- a/src/Draw/Draw_Interpretor.cxx +++ b/src/Draw/Draw_Interpretor.cxx @@ -108,7 +108,7 @@ namespace { tmp_file->Remove(); } -}; +} // MKV 29.03.05 #if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST) diff --git a/src/DrawTrSurf/DrawTrSurf.hxx b/src/DrawTrSurf/DrawTrSurf.hxx index 7056f79d1c..ad7a723afb 100644 --- a/src/DrawTrSurf/DrawTrSurf.hxx +++ b/src/DrawTrSurf/DrawTrSurf.hxx @@ -89,7 +89,7 @@ public: //! 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 static void Set (const Standard_CString Name, const Handle(T)& Arg, typename std::enable_if::value>::type * = 0) { Set (Name, (const Handle(Geom_Geometry)&)Arg); }; +template static void Set (const Standard_CString Name, const Handle(T)& Arg, typename std::enable_if::value>::type * = 0) { Set (Name, (const Handle(Geom_Geometry)&)Arg); } //! Sets in the variable . Overwrite the //! variable if already set. diff --git a/src/Font/Font_BRepFont.cxx b/src/Font/Font_BRepFont.cxx index c538898983..a1fcfb7ec9 100755 --- a/src/Font/Font_BRepFont.cxx +++ b/src/Font/Font_BRepFont.cxx @@ -62,7 +62,7 @@ namespace return theSize / Standard_Real(THE_FONT_SIZE) * 72.0 / Standard_Real(THE_RESOLUTION_DPI); } -}; +} // ======================================================================= // function : Constructor diff --git a/src/Font/Font_FontMgr.cxx b/src/Font/Font_FontMgr.cxx index edb1cae6b0..fc64f4bad1 100644 --- a/src/Font/Font_FontMgr.cxx +++ b/src/Font/Font_FontMgr.cxx @@ -173,7 +173,7 @@ static const Font_FontMgr_FontAliasMapNode Font_FontMgr_MapOfFontsAliases[] = } } - }; + } #endif diff --git a/src/GProp/GProp_SelGProps.cxx b/src/GProp/GProp_SelGProps.cxx index 9543095e43..edcb3d631e 100644 --- a/src/GProp/GProp_SelGProps.cxx +++ b/src/GProp/GProp_SelGProps.cxx @@ -25,7 +25,7 @@ #include #include -GProp_SelGProps::GProp_SelGProps(){}; +GProp_SelGProps::GProp_SelGProps(){} void GProp_SelGProps::SetLocation(const gp_Pnt& SLocation ) { diff --git a/src/GeomFill/GeomFill_CorrectedFrenet.cxx b/src/GeomFill/GeomFill_CorrectedFrenet.cxx index 3987adcbeb..9f46ff516a 100644 --- a/src/GeomFill/GeomFill_CorrectedFrenet.cxx +++ b/src/GeomFill/GeomFill_CorrectedFrenet.cxx @@ -631,18 +631,18 @@ Standard_Real GeomFill_CorrectedFrenet::CalcAngleAT(const gp_Vec& Tangent, const 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 @@ -671,7 +671,7 @@ Standard_Real GeomFill_CorrectedFrenet::GetAngleAT(const Standard_Real Param) co AngP = AngPo + DAng; }; return AngP; -}; +} //=============================================================== // Function : D0 // Purpose : diff --git a/src/GeomLib/GeomLib_Interpolate.lxx b/src/GeomLib/GeomLib_Interpolate.lxx index b7d9dba289..6150fe370d 100644 --- a/src/GeomLib/GeomLib_Interpolate.lxx +++ b/src/GeomLib/GeomLib_Interpolate.lxx @@ -20,7 +20,7 @@ //======================================================================= inline Standard_Boolean GeomLib_Interpolate::IsDone() const -{ return myIsDone ; } ; +{ return myIsDone ; } //======================================================================= //function : Error //purpose : diff --git a/src/Graphic3d/Graphic3d_Camera.cxx b/src/Graphic3d/Graphic3d_Camera.cxx index d5e531b3c5..5696abc622 100644 --- a/src/Graphic3d/Graphic3d_Camera.cxx +++ b/src/Graphic3d/Graphic3d_Camera.cxx @@ -60,8 +60,8 @@ namespace Standard_Real aLogRadix = Log10 (anAbsValue) / Log10 (FLT_RADIX); Standard_Real aExp = Floor (aLogRadix); return FLT_EPSILON * Pow (FLT_RADIX, aExp); - }; -}; + } +} // ======================================================================= // function : Graphic3d_Camera diff --git a/src/Graphic3d/Graphic3d_Camera.hxx b/src/Graphic3d/Graphic3d_Camera.hxx index 39604147fe..ca9180196d 100644 --- a/src/Graphic3d/Graphic3d_Camera.hxx +++ b/src/Graphic3d/Graphic3d_Camera.hxx @@ -637,7 +637,7 @@ private: public: - DEFINE_STANDARD_RTTIEXT(Graphic3d_Camera,Standard_Transient); + DEFINE_STANDARD_RTTIEXT(Graphic3d_Camera,Standard_Transient) }; DEFINE_STANDARD_HANDLE (Graphic3d_Camera, Standard_Transient) diff --git a/src/Graphic3d/Graphic3d_ClipPlane.cxx b/src/Graphic3d/Graphic3d_ClipPlane.cxx index bed8508dd1..7b5b54c443 100755 --- a/src/Graphic3d/Graphic3d_ClipPlane.cxx +++ b/src/Graphic3d/Graphic3d_ClipPlane.cxx @@ -24,7 +24,7 @@ IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ClipPlane,Standard_Transient) namespace { static volatile Standard_Integer THE_CLIP_PLANE_COUNTER = 0; -}; +} // ======================================================================= // function : Graphic3d_ClipPlane diff --git a/src/Graphic3d/Graphic3d_ClipPlane.hxx b/src/Graphic3d/Graphic3d_ClipPlane.hxx index 318c335ced..c402ff8a0f 100755 --- a/src/Graphic3d/Graphic3d_ClipPlane.hxx +++ b/src/Graphic3d/Graphic3d_ClipPlane.hxx @@ -218,7 +218,7 @@ private: public: - DEFINE_STANDARD_RTTIEXT(Graphic3d_ClipPlane,Standard_Transient); + DEFINE_STANDARD_RTTIEXT(Graphic3d_ClipPlane,Standard_Transient) }; DEFINE_STANDARD_HANDLE (Graphic3d_ClipPlane, Standard_Transient) diff --git a/src/Graphic3d/Graphic3d_MarkerImage.cxx b/src/Graphic3d/Graphic3d_MarkerImage.cxx index fd5eb6cd4f..44137b03ed 100755 --- a/src/Graphic3d/Graphic3d_MarkerImage.cxx +++ b/src/Graphic3d/Graphic3d_MarkerImage.cxx @@ -24,7 +24,7 @@ IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_MarkerImage,Standard_Transient) namespace { static volatile Standard_Integer THE_MARKER_IMAGE_COUNTER = 0; -}; +} // ======================================================================= diff --git a/src/Graphic3d/Graphic3d_ShaderObject.cxx b/src/Graphic3d/Graphic3d_ShaderObject.cxx index adf7944362..eada5bda97 100755 --- a/src/Graphic3d/Graphic3d_ShaderObject.cxx +++ b/src/Graphic3d/Graphic3d_ShaderObject.cxx @@ -24,7 +24,7 @@ IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ShaderObject,Standard_Transient) namespace { static volatile Standard_Integer THE_SHADER_OBJECT_COUNTER = 0; -}; +} // ======================================================================= diff --git a/src/Graphic3d/Graphic3d_ShaderProgram.cxx b/src/Graphic3d/Graphic3d_ShaderProgram.cxx index 1d14d4ceff..25862914cf 100755 --- a/src/Graphic3d/Graphic3d_ShaderProgram.cxx +++ b/src/Graphic3d/Graphic3d_ShaderProgram.cxx @@ -29,7 +29,7 @@ IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ShaderProgram,Standard_Transient) namespace { static volatile Standard_Integer THE_PROGRAM_OBJECT_COUNTER = 0; -}; +} // ======================================================================= diff --git a/src/Graphic3d/Graphic3d_TextureRoot.cxx b/src/Graphic3d/Graphic3d_TextureRoot.cxx index 249ee30401..3902b10e53 100644 --- a/src/Graphic3d/Graphic3d_TextureRoot.cxx +++ b/src/Graphic3d/Graphic3d_TextureRoot.cxx @@ -33,7 +33,7 @@ IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_TextureRoot,MMgt_TShared) namespace { static volatile Standard_Integer THE_TEXTURE_COUNTER = 0; -}; +} // ======================================================================= // function : TexturesFolder diff --git a/src/Image/Image_Diff.cxx b/src/Image/Image_Diff.cxx index fa2c607846..85b4f2b7f7 100644 --- a/src/Image/Image_Diff.cxx +++ b/src/Image/Image_Diff.cxx @@ -126,7 +126,7 @@ namespace || theFormat == Image_PixMap::ImgRGBA || theFormat == Image_PixMap::ImgBGRA; } -}; +} // ======================================================================= // function : Image_Diff diff --git a/src/IntSurf/IntSurf_PntOn2S.cxx b/src/IntSurf/IntSurf_PntOn2S.cxx index eb8a15ef24..14a25d22ff 100644 --- a/src/IntSurf/IntSurf_PntOn2S.cxx +++ b/src/IntSurf/IntSurf_PntOn2S.cxx @@ -16,7 +16,7 @@ #include #include -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, diff --git a/src/IntTools/IntTools.cxx b/src/IntTools/IntTools.cxx index b4d023318d..14509042f4 100644 --- a/src/IntTools/IntTools.cxx +++ b/src/IntTools/IntTools.cxx @@ -207,7 +207,7 @@ namespace { { return theLeft.Root() < theRight.Root(); } -}; +} //======================================================================= //function : SortRoots diff --git a/src/Intf/Intf_InterferencePolygon2d.cxx b/src/Intf/Intf_InterferencePolygon2d.cxx index 37c41f6dbe..d2e56411b8 100644 --- a/src/Intf/Intf_InterferencePolygon2d.cxx +++ b/src/Intf/Intf_InterferencePolygon2d.cxx @@ -33,7 +33,7 @@ namespace { static const Standard_Real PRCANG = Precision::Angular(); -}; +} //======================================================================= //function : Intf_InterferencePolygon2d diff --git a/src/NCollection/NCollection_BaseAllocator.cxx b/src/NCollection/NCollection_BaseAllocator.cxx index 0fcd972b20..4acc0cfe3d 100644 --- a/src/NCollection/NCollection_BaseAllocator.cxx +++ b/src/NCollection/NCollection_BaseAllocator.cxx @@ -173,7 +173,7 @@ Standard_EXPORT void StandardCallBack_Reset() namespace { // dummy function for break point inline void place_for_break_point () {} -}; +} //======================================================================= //function : StandardCallBack diff --git a/src/OSD/OSD_Disk.cxx b/src/OSD/OSD_Disk.cxx index 9125812533..20a3bbad5d 100644 --- a/src/OSD/OSD_Disk.cxx +++ b/src/OSD/OSD_Disk.cxx @@ -32,7 +32,11 @@ extern "C" { #define fstatvfs fstatfs #else #include - 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 diff --git a/src/OSD/OSD_MAllocHook.cxx b/src/OSD/OSD_MAllocHook.cxx index f5f8a8e163..6905f2fa57 100644 --- a/src/OSD/OSD_MAllocHook.cxx +++ b/src/OSD/OSD_MAllocHook.cxx @@ -44,7 +44,7 @@ namespace { // otherwise compiler does not leave a place for break point debug_counter++; } -}; +} //======================================================================= //function : GetCallback diff --git a/src/OSD/OSD_SharedLibrary.cxx b/src/OSD/OSD_SharedLibrary.cxx index aa5d472b16..6d4258b013 100644 --- a/src/OSD/OSD_SharedLibrary.cxx +++ b/src/OSD/OSD_SharedLibrary.cxx @@ -43,7 +43,11 @@ extern "C" {void *dlerror (void);} #include -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) diff --git a/src/OpenGl/OpenGl_AspectFace.cxx b/src/OpenGl/OpenGl_AspectFace.cxx index 0b290b5e6a..bd4519903c 100644 --- a/src/OpenGl/OpenGl_AspectFace.cxx +++ b/src/OpenGl/OpenGl_AspectFace.cxx @@ -48,7 +48,7 @@ namespace }; static const TCollection_AsciiString THE_EMPTY_KEY; -}; +} // ======================================================================= // function : convertMaterial diff --git a/src/OpenGl/OpenGl_AspectLine.cxx b/src/OpenGl/OpenGl_AspectLine.cxx index f0351c2035..ccc219ae0a 100644 --- a/src/OpenGl/OpenGl_AspectLine.cxx +++ b/src/OpenGl/OpenGl_AspectLine.cxx @@ -25,7 +25,7 @@ namespace { static const TEL_COLOUR myDefaultColor = {{ 1.0F, 1.0F, 1.0F, 1.0F }}; static const TCollection_AsciiString THE_EMPTY_KEY; -}; +} // ======================================================================= // function : OpenGl_AspectLine diff --git a/src/OpenGl/OpenGl_AspectText.cxx b/src/OpenGl/OpenGl_AspectText.cxx index 45d256859b..000694b8e4 100755 --- a/src/OpenGl/OpenGl_AspectText.cxx +++ b/src/OpenGl/OpenGl_AspectText.cxx @@ -25,7 +25,7 @@ namespace { static const TEL_COLOUR TheDefaultColor = {{ 1.0F, 1.0F, 1.0F, 1.0F }}; static const TCollection_AsciiString THE_EMPTY_KEY; -}; +} // ======================================================================= // function : OpenGl_AspectText diff --git a/src/OpenGl/OpenGl_ShaderManager.cxx b/src/OpenGl/OpenGl_ShaderManager.cxx index 8ab515b4e4..348c7aa623 100644 --- a/src/OpenGl/OpenGl_ShaderManager.cxx +++ b/src/OpenGl/OpenGl_ShaderManager.cxx @@ -976,7 +976,7 @@ static void PushAspectMarker (const Handle(OpenGl_Context)& theCtx, 5, aParams); } -}; // nameless namespace +} // nameless namespace // ======================================================================= // function : PushMaterialState diff --git a/src/OpenGl/OpenGl_Text.cxx b/src/OpenGl/OpenGl_Text.cxx index 2aacc5216e..7ffe273073 100644 --- a/src/OpenGl/OpenGl_Text.cxx +++ b/src/OpenGl/OpenGl_Text.cxx @@ -136,7 +136,7 @@ namespace } #endif -}; +} // ======================================================================= // function : OpenGl_Text diff --git a/src/OpenGl/OpenGl_Workspace.cxx b/src/OpenGl/OpenGl_Workspace.cxx index be86c98207..5ce42ab5c4 100644 --- a/src/OpenGl/OpenGl_Workspace.cxx +++ b/src/OpenGl/OpenGl_Workspace.cxx @@ -65,7 +65,7 @@ namespace { 0.0F, 0.0F, 0.0F, 1.0F }} }; -}; +} // ======================================================================= // function : Init diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx index 195acb1f45..783a434c4e 100644 --- a/src/QABugs/QABugs_19.cxx +++ b/src/QABugs/QABugs_19.cxx @@ -4647,7 +4647,7 @@ static Standard_Integer OCC26746( return 0; } -DEFINE_STANDARD_HANDLE(QABugs_VertexFilter, SelectMgr_Filter); +DEFINE_STANDARD_HANDLE(QABugs_VertexFilter, SelectMgr_Filter) class QABugs_VertexFilter: public SelectMgr_Filter { public: diff --git a/src/STEPControl/STEPControl_ActorRead.cxx b/src/STEPControl/STEPControl_ActorRead.cxx index 834ad7ea38..3bfbd2309a 100644 --- a/src/STEPControl/STEPControl_ActorRead.cxx +++ b/src/STEPControl/STEPControl_ActorRead.cxx @@ -192,7 +192,7 @@ namespace { // 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 () diff --git a/src/SelectMgr/SelectMgr_VectorTypes.hxx b/src/SelectMgr/SelectMgr_VectorTypes.hxx index a1bf085d24..bd534bd2e6 100644 --- a/src/SelectMgr/SelectMgr_VectorTypes.hxx +++ b/src/SelectMgr/SelectMgr_VectorTypes.hxx @@ -41,6 +41,6 @@ namespace SelectMgr_MatOp return aRes; } -}; +} #endif // _SelectMgr_VectorTypes_HeaderFile diff --git a/src/StdPrs/StdPrs_ShadedShape.cxx b/src/StdPrs/StdPrs_ShadedShape.cxx index e55e1a29d2..92f080c3ea 100644 --- a/src/StdPrs/StdPrs_ShadedShape.cxx +++ b/src/StdPrs/StdPrs_ShadedShape.cxx @@ -418,7 +418,7 @@ namespace aPrsGrp->SetGroupPrimitivesAspect (aBoundaryAspect); aPrsGrp->AddPrimitiveArray (aSegments); } -}; +} // ======================================================================= // function : ExploreSolids diff --git a/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx b/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx index 76a01827af..3299fd38b8 100644 --- a/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx +++ b/src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx @@ -357,7 +357,7 @@ static Standard_Boolean FUN_findTOOF(const TopOpeBRepDS_PDataStructure pDS, 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 : "<