Useless semicolons are removed after closing braces of namespaces and macros in code dependent on FreeImage and VTK.
Comments added at the closing braces of namespaces to help comprehension.
In OSD_File.cxx and OSD_Disk.cxx, unnecessary declarations of system functions are removed
}
}
-}
+} // namespace Aspect_Convert
#endif /* _Aspect_Convert_HeaderFile */
//! Other data structures
typedef std::pair<HArray1OfSegments, HBndBox2dTree> SegmentsTree;
typedef NCollection_Array1<SegmentsTree> Array1OfSegmentsTree;
-}
+
+} // namespace BRepMesh
#endif
tmp_file->Remove();
}
-}
+} // anonymous namespace
// MKV 29.03.05
#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST)
}
}
- }
+ } // anonymous namespace
#endif
}
}
-vtkStandardNewMacro(IVtkDraw_Interactor);
+vtkStandardNewMacro(IVtkDraw_Interactor)
//===========================================================
// Function : Constructor
{
public:
static IVtkDraw_Interactor *New();
- vtkTypeMacro (IVtkDraw_Interactor, vtkRenderWindowInteractor);
+
+ vtkTypeMacro (IVtkDraw_Interactor, vtkRenderWindowInteractor)
virtual void Initialize();
virtual void Enable();
theMapper->SetLookupTable (theColorTable);
theMapper->Update();
}
-};
+
+} // namespace IVtkTools
Standard_EXPORT void InitShapeMapper (vtkMapper* theMapper,
vtkLookupTable* theColorTable);
-};
+}
#endif // IVtkTOOLS_H
#include <vtkInformationVector.h>
#include <vtkObjectFactory.h>
-vtkStandardNewMacro(IVtkTools_DisplayModeFilter);
+vtkStandardNewMacro(IVtkTools_DisplayModeFilter)
//============================================================================
// Method: Constructor
class Standard_EXPORT IVtkTools_DisplayModeFilter : public IVtkTools_SubPolyDataFilter
{
public:
- vtkTypeMacro(IVtkTools_DisplayModeFilter,IVtkTools_SubPolyDataFilter);
+ vtkTypeMacro(IVtkTools_DisplayModeFilter,IVtkTools_SubPolyDataFilter)
+
static IVtkTools_DisplayModeFilter *New();
void PrintSelf (std::ostream& os, vtkIndent indent);
#include <vtkTransform.h>
#include <vtkTransformPolyDataFilter.h>
-vtkStandardNewMacro(IVtkTools_ShapeDataSource);
+vtkStandardNewMacro(IVtkTools_ShapeDataSource)
//================================================================
// Function : Constructor
{
public:
- vtkTypeMacro(IVtkTools_ShapeDataSource, vtkPolyDataAlgorithm);
+ vtkTypeMacro(IVtkTools_ShapeDataSource, vtkPolyDataAlgorithm)
+
static IVtkTools_ShapeDataSource* New();
//! @class IVtkTools_ShapeObject
//! @brief VTK holder class for OCC shapes to pass them through pipelines.
-vtkStandardNewMacro(IVtkTools_ShapeObject);
+vtkStandardNewMacro(IVtkTools_ShapeObject)
//============================================================================
// Method: Constructor
class IVtkTools_EXPORT IVtkTools_ShapeObject : public vtkDataObject
{
public:
- vtkTypeMacro (IVtkTools_ShapeObject, vtkObject);
+ vtkTypeMacro (IVtkTools_ShapeObject, vtkObject)
static IVtkTools_ShapeObject* New();
//! before the user starts to select interactively, in order for the OCCT selection
//! algorithm to prepare its internal selection data.
-vtkStandardNewMacro(IVtkTools_ShapePicker);
+vtkStandardNewMacro(IVtkTools_ShapePicker)
//============================================================================
// Method: IVtkTools_ShapePicker
class IVtkTools_EXPORT IVtkTools_ShapePicker : public vtkAbstractPropPicker
{
public:
- vtkTypeMacro(IVtkTools_ShapePicker, vtkAbstractPropPicker);
+ vtkTypeMacro(IVtkTools_ShapePicker, vtkAbstractPropPicker)
+
static IVtkTools_ShapePicker* New();
//! Pick entities in the given point or area.
#include <vtkIdTypeArray.h>
-vtkStandardNewMacro(IVtkTools_SubPolyDataFilter);
+vtkStandardNewMacro(IVtkTools_SubPolyDataFilter)
//================================================================
// Function : Constructor
class IVtkTools_EXPORT IVtkTools_SubPolyDataFilter : public vtkPolyDataAlgorithm
{
public:
- vtkTypeMacro(IVtkTools_SubPolyDataFilter,vtkPolyDataAlgorithm);
+ vtkTypeMacro(IVtkTools_SubPolyDataFilter,vtkPolyDataAlgorithm)
+
static IVtkTools_SubPolyDataFilter *New();
void PrintSelf (std::ostream& theOs, vtkIndent theIndent);
// Since VTK 6 the factory methods require "auto-initialization" depending on
// what modules are enabled at VTK configure time.
// Some defines are needed in order to make the factories work properly.
-VTK_MODULE_INIT(vtkRenderingOpenGL);
-VTK_MODULE_INIT(vtkInteractionStyle);
+VTK_MODULE_INIT(vtkRenderingOpenGL)
+VTK_MODULE_INIT(vtkInteractionStyle)
// Handle implementation
return FIT_UNKNOWN;
}
}
-};
+}
#endif
|| theFormat == Image_PixMap::ImgRGBA
|| theFormat == Image_PixMap::ImgBGRA;
}
-}
+
+} // anonymous namespace
// =======================================================================
// function : Image_Diff
#define fstatvfs fstatfs
#else
#include <sys/statvfs.h>
- #ifdef __GNU_LIBRARY__
- int statvfs(const char *, struct statvfs *) __THROW;
- #else
- int statvfs(const char *, struct statvfs *);
- #endif
#endif
#ifdef __cplusplus
#include <dlfcn.h>
-#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)
// ----------------------------------------------------------------
}
#endif
-}
+} // anonymous namespace
// =======================================================================
// function : OpenGl_Text
aPrsGrp->SetGroupPrimitivesAspect (aBoundaryAspect);
aPrsGrp->AddPrimitiveArray (aSegments);
}
-}
+
+} // anonymous namespace
// =======================================================================
// function : ExploreSolids
return ok;
}
-Standard_EXPORT Standard_Boolean GLOBAL_btcx = Standard_False;void debtcx(){}
+Standard_EXPORT Standard_Boolean GLOBAL_btcx = Standard_False;
Standard_EXPORT void debtcxmess(Standard_Integer f1,Standard_Integer f2,Standard_Integer il)
-{cout<<"f1,f2,il : "<<f1<<","<<f2<<","<<il<<endl;cout.flush();debtcx();}
+{cout<<"f1,f2,il : "<<f1<<","<<f2<<","<<il<<endl;cout.flush();}
//=======================================================================
//function : ProcessLine
const Standard_ShortReal theXShift,
const Standard_ShortReal theYShift,
const Standard_ShortReal theAngle);
- DEFINE_STANDARD_RTTI_INLINE(OCC_TextureEnv,Graphic3d_TextureEnv);
+ DEFINE_STANDARD_RTTI_INLINE(OCC_TextureEnv,Graphic3d_TextureEnv)
};
DEFINE_STANDARD_HANDLE(OCC_TextureEnv, Graphic3d_TextureEnv)
-
-
-
OCC_TextureEnv::OCC_TextureEnv(const Standard_CString theFileName)
: Graphic3d_TextureEnv(theFileName)
{
projects / occt-copy.git / commitdiff