From 2cb4424136bc7bfc0e364638091fc8e4e79f9bb3 Mon Sep 17 00:00:00 2001 From: abv Date: Fri, 11 Apr 2014 13:59:41 +0400 Subject: [PATCH] 0024805: Eliminate unused static functions and methods: ShallowDump(), ShallowCopy(), STANDARD_TYPE(...) Implementation of global functions STANDARD_TYPE() for types not inheriting Standard_Transient or Standard_Persistent are eliminated. Global functions and class methods ShallowCopy() are removed; also removed unused classes Visual3d_PickPath and Visual3d_PickDescriptor. Global functions and class methods ShallowDump() are removed, except for classes Standard_GUID, TopLoc_Datum, and TopLoc_Location as the latter are still used in some Debug printouts. --- src/Aspect/Aspect_CLayer2d.cxx | 20 -- src/Aspect/Aspect_CLayer2d.hxx | 8 - src/Aspect/Aspect_Display.hxx | 12 +- src/Aspect/Aspect_Drawable.hxx | 10 - src/Aspect/Aspect_FStream.cxx | 24 -- src/Aspect/Aspect_FStream.hxx | 3 - src/Aspect/Aspect_GraphicCallbackProc.hxx | 3 - src/Aspect/Aspect_Handle.cxx | 21 -- src/Aspect/Aspect_Handle.hxx | 10 - src/Aspect/Aspect_IFStream.cxx | 23 -- src/Aspect/Aspect_IFStream.hxx | 5 +- src/Aspect/Aspect_RGBPixel.cxx | 24 -- src/Aspect/Aspect_RGBPixel.hxx | 3 - src/Aspect/Aspect_RenderingContext.hxx | 10 - src/Aspect/FILES | 5 - src/DBC/DBC_BaseArray.cdl | 9 - src/DBC/DBC_BaseArray.cxx | 12 - src/DBC/DBC_BaseArray_objs.hxx | 21 -- src/DDataStd/DDataStd_BasicCommands.cxx | 2 - src/Graphic3d/FILES | 12 - src/Graphic3d/Graphic3d_CBitFields16.cxx | 22 -- src/Graphic3d/Graphic3d_CBitFields16.hxx | 7 - src/Graphic3d/Graphic3d_CBitFields20.cxx | 22 -- src/Graphic3d/Graphic3d_CBitFields20.hxx | 7 - src/Graphic3d/Graphic3d_CBitFields4.cxx | 22 -- src/Graphic3d/Graphic3d_CBitFields4.hxx | 7 - src/Graphic3d/Graphic3d_CBitFields8.cxx | 22 -- src/Graphic3d/Graphic3d_CBitFields8.hxx | 7 - src/Graphic3d/Graphic3d_CBounds.cxx | 21 -- src/Graphic3d/Graphic3d_CBounds.hxx | 7 - .../Graphic3d_CGraduatedTrihedron.cxx | 23 -- .../Graphic3d_CGraduatedTrihedron.hxx | 3 - src/Graphic3d/Graphic3d_CLight.cxx | 21 -- src/Graphic3d/Graphic3d_CLight.hxx | 1 - src/Graphic3d/Graphic3d_CPick.cxx | 21 -- src/Graphic3d/Graphic3d_CPick.hxx | 8 - src/Graphic3d/Graphic3d_CTexture.cxx | 21 -- src/Graphic3d/Graphic3d_CTexture.hxx | 3 - src/Graphic3d/Graphic3d_CTransPersStruct.cxx | 21 -- src/Graphic3d/Graphic3d_CTransPersStruct.hxx | 7 - src/Graphic3d/Graphic3d_CUserDraw.cxx | 21 -- src/Graphic3d/Graphic3d_CUserDraw.hxx | 7 - src/Graphic3d/Graphic3d_CView.cxx | 21 -- src/Graphic3d/Graphic3d_CView.hxx | 3 - src/IFSelect/FILES | 1 - src/IFSelect/IFSelect_ActFunc.cxx | 30 --- src/IFSelect/IFSelect_ActFunc.hxx | 3 - src/MoniTool/FILES | 2 - src/MoniTool/MoniTool_ValueInterpret.cxx | 30 --- src/MoniTool/MoniTool_ValueInterpret.hxx | 3 - src/MoniTool/MoniTool_ValueSatisfies.cxx | 30 --- src/MoniTool/MoniTool_ValueSatisfies.hxx | 3 - src/NCollection/NCollection_UtfString.hxx | 6 +- src/OSD/FILES | 1 - src/OSD/OSD_Function.cxx | 23 -- src/OSD/OSD_Function.hxx | 3 - src/OSD/OSD_MAllocHook.cxx | 1 + src/PCollection/PCollection_HArray1.cdl | 12 - src/PCollection/PCollection_HArray1.gxx | 24 -- src/PCollection/PCollection_HArray2.cdl | 12 - src/PCollection/PCollection_HArray2.gxx | 23 -- src/PCollection/PCollection_HAsciiString.cdl | 5 - src/PCollection/PCollection_HAsciiString.cxx | 10 - src/PCollection/PCollection_HDoubleList.cdl | 11 - src/PCollection/PCollection_HDoubleList.gxx | 57 ----- .../PCollection_HExtendedString.cdl | 6 - .../PCollection_HExtendedString.cxx | 11 - src/PCollection/PCollection_HSequence.cdl | 13 - src/PCollection/PCollection_HSequence.gxx | 46 ---- src/PCollection/PCollection_HSingleList.cdl | 14 -- src/PCollection/PCollection_HSingleList.gxx | 62 ----- src/PMMgt/PMMgt_PManaged.cxx | 8 - src/SWDRAW/SWDRAW.cxx | 2 - src/ShapeProcess/FILES | 1 - src/ShapeProcess/ShapeProcess_OperFunc.cxx | 30 --- src/ShapeProcess/ShapeProcess_OperFunc.hxx | 3 - src/Standard/FILES | 10 - src/Standard/Handle_Standard_Persistent.hxx | 2 - src/Standard/Standard_Address.cxx | 34 --- src/Standard/Standard_Address.hxx | 24 -- src/Standard/Standard_Boolean.cxx | 51 ---- src/Standard/Standard_Boolean.hxx | 57 +---- src/Standard/Standard_CString.cxx | 17 -- src/Standard/Standard_CString.hxx | 12 - src/Standard/Standard_Character.cxx | 58 ----- src/Standard/Standard_Character.hxx | 30 --- src/Standard/Standard_ExtCharacter.cxx | 59 ----- src/Standard/Standard_ExtCharacter.hxx | 40 --- src/Standard/Standard_ExtString.cxx | 18 -- src/Standard/Standard_ExtString.hxx | 13 - src/Standard/Standard_GUID.cdl | 2 +- src/Standard/Standard_IStream.cxx | 25 -- src/Standard/Standard_IStream.hxx | 6 +- src/Standard/Standard_Integer.cxx | 227 ------------------ src/Standard/Standard_Integer.hxx | 23 +- src/Standard/Standard_OId.hxx | 31 --- src/Standard/Standard_OStream.cxx | 26 -- src/Standard/Standard_OStream.hxx | 19 +- src/Standard/Standard_Persistent.cdl | 7 - src/Standard/Standard_Persistent.cxx | 28 --- src/Standard/Standard_Persistent_proto.hxx | 3 +- src/Standard/Standard_PrimitiveTypes.hxx | 3 - src/Standard/Standard_Real.cxx | 24 -- src/Standard/Standard_Real.hxx | 10 - src/Standard/Standard_ShallowDump.cxx | 40 --- src/Standard/Standard_ShortReal.cxx | 25 -- src/Standard/Standard_ShortReal.hxx | 7 - src/Standard/Standard_Storable.cdl | 8 - src/Standard/Standard_Storable.cxx | 7 - src/Standard/Standard_Time.cxx | 23 -- src/Standard/Standard_Time.hxx | 4 - src/Standard/Standard_Transient.cxx | 6 - src/Standard/Standard_Transient_proto.hxx | 2 - src/Standard/Standard_Type.cdl | 12 - src/Standard/Standard_Type.cxx | 67 ------ src/Standard/Standard_UUID.cxx | 6 - src/Standard/Standard_UUID.hxx | 3 - src/Storage/FILES | 1 - src/Storage/Storage_Container.cxx | 22 -- src/Storage/Storage_Container.hxx | 2 - src/Storage/Storage_Macros.hxx | 2 +- src/TCollection/TCollection_HAsciiString.cdl | 8 - src/TCollection/TCollection_HAsciiString.cxx | 21 -- .../TCollection_HExtendedString.cdl | 6 - .../TCollection_HExtendedString.cxx | 21 -- src/TCollection/TCollection_HSequence.gxx | 12 - src/TCollection/TCollection_HSet.cdl | 9 - src/TCollection/TCollection_HSet.gxx | 12 - src/TDF/TDF_Attribute.cxx | 4 +- src/V3d/V3d_DirectionalLight.cxx | 3 - src/V3d/V3d_PositionLight.cxx | 3 - src/V3d/V3d_PositionalLight.cxx | 3 - src/V3d/V3d_SpotLight.cxx | 3 - src/Visual3d/Visual3d.cdl | 23 -- src/Visual3d/Visual3d_PickDescriptor.cdl | 145 ----------- src/Visual3d/Visual3d_PickDescriptor.cxx | 156 ------------ src/Visual3d/Visual3d_PickPath.cdl | 138 ----------- src/Visual3d/Visual3d_PickPath.cxx | 114 --------- src/Visual3d/Visual3d_ViewManager.cdl | 9 - src/Visual3d/Visual3d_ViewManager.cxx | 1 - src/WNT/WNT_Dword.hxx | 2 - src/WNT/WNT_Uint.hxx | 2 - src/WNT/WNT_WindowData.hxx | 2 - 143 files changed, 16 insertions(+), 2825 deletions(-) delete mode 100644 src/Aspect/Aspect_CLayer2d.cxx delete mode 100644 src/Aspect/Aspect_FStream.cxx delete mode 100644 src/Aspect/Aspect_Handle.cxx delete mode 100644 src/Aspect/Aspect_IFStream.cxx delete mode 100644 src/Aspect/Aspect_RGBPixel.cxx delete mode 100644 src/Graphic3d/Graphic3d_CBitFields16.cxx delete mode 100644 src/Graphic3d/Graphic3d_CBitFields20.cxx delete mode 100644 src/Graphic3d/Graphic3d_CBitFields4.cxx delete mode 100644 src/Graphic3d/Graphic3d_CBitFields8.cxx delete mode 100644 src/Graphic3d/Graphic3d_CBounds.cxx delete mode 100644 src/Graphic3d/Graphic3d_CGraduatedTrihedron.cxx delete mode 100644 src/Graphic3d/Graphic3d_CLight.cxx delete mode 100644 src/Graphic3d/Graphic3d_CPick.cxx delete mode 100644 src/Graphic3d/Graphic3d_CTexture.cxx delete mode 100644 src/Graphic3d/Graphic3d_CTransPersStruct.cxx delete mode 100644 src/Graphic3d/Graphic3d_CUserDraw.cxx delete mode 100644 src/Graphic3d/Graphic3d_CView.cxx delete mode 100644 src/IFSelect/IFSelect_ActFunc.cxx delete mode 100644 src/MoniTool/MoniTool_ValueInterpret.cxx delete mode 100644 src/MoniTool/MoniTool_ValueSatisfies.cxx delete mode 100644 src/OSD/OSD_Function.cxx delete mode 100644 src/ShapeProcess/ShapeProcess_OperFunc.cxx delete mode 100644 src/Standard/Standard_Address.cxx delete mode 100644 src/Standard/Standard_Boolean.cxx delete mode 100644 src/Standard/Standard_Character.cxx delete mode 100644 src/Standard/Standard_ExtCharacter.cxx delete mode 100644 src/Standard/Standard_IStream.cxx delete mode 100644 src/Standard/Standard_Integer.cxx delete mode 100644 src/Standard/Standard_OId.hxx delete mode 100644 src/Standard/Standard_OStream.cxx delete mode 100644 src/Standard/Standard_ShallowDump.cxx delete mode 100755 src/Standard/Standard_Time.cxx delete mode 100644 src/Storage/Storage_Container.cxx delete mode 100644 src/Visual3d/Visual3d_PickDescriptor.cdl delete mode 100644 src/Visual3d/Visual3d_PickDescriptor.cxx delete mode 100644 src/Visual3d/Visual3d_PickPath.cdl delete mode 100644 src/Visual3d/Visual3d_PickPath.cxx diff --git a/src/Aspect/Aspect_CLayer2d.cxx b/src/Aspect/Aspect_CLayer2d.cxx deleted file mode 100644 index 86ff4fc3fb..0000000000 --- a/src/Aspect/Aspect_CLayer2d.cxx +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& STANDARD_TYPE(Aspect_CLayer2d) -{ - static Handle(Standard_Type) _atype = new Standard_Type ("Aspect_CLayer2d", sizeof (Aspect_CLayer2d)); - return _atype; -} diff --git a/src/Aspect/Aspect_CLayer2d.hxx b/src/Aspect/Aspect_CLayer2d.hxx index 6cdd5b2e82..27d49d2f51 100644 --- a/src/Aspect/Aspect_CLayer2d.hxx +++ b/src/Aspect/Aspect_CLayer2d.hxx @@ -24,12 +24,4 @@ #include typedef CALL_DEF_LAYER Aspect_CLayer2d; -#if defined(__cplusplus) || defined(c_plusplus) -/*==== Definition de Type ====================================================*/ - -#include -const Handle(Standard_Type)& TYPE(Aspect_CLayer2d) ; -/*============================================================================*/ - -#endif #endif /*Aspect_CLayer2d_HeaderFile*/ diff --git a/src/Aspect/Aspect_Display.hxx b/src/Aspect/Aspect_Display.hxx index a9695b382f..6badfe3275 100644 --- a/src/Aspect/Aspect_Display.hxx +++ b/src/Aspect/Aspect_Display.hxx @@ -21,16 +21,6 @@ #ifndef _Aspect_Display_HeaderFile #define _Aspect_Display_HeaderFile - typedef void* Aspect_Display; /* Display* under UNIX */ - -#if defined(__cplusplus) || defined(c_plusplus) -/*==== Definition de Type ====================================================*/ - -#include -class Handle(Standard_Type); -const Handle(Standard_Type)& STANDARD_TYPE(Aspect_Display); - -/*============================================================================*/ -#endif +typedef void* Aspect_Display; /* Display* under UNIX */ #endif /* _Aspect_Display_HeaderFile */ diff --git a/src/Aspect/Aspect_Drawable.hxx b/src/Aspect/Aspect_Drawable.hxx index 8324edceb6..c63d9b514d 100644 --- a/src/Aspect/Aspect_Drawable.hxx +++ b/src/Aspect/Aspect_Drawable.hxx @@ -27,14 +27,4 @@ typedef unsigned long Aspect_Drawable; /* Window or Pixmap under UNIX */ #endif /* WNT */ -#if defined(__cplusplus) || defined(c_plusplus) -/*==== Definition de Type ====================================================*/ - -#include -class Handle(Standard_Type); -const Handle(Standard_Type)& STANDARD_TYPE(Aspect_Drawable); - -/*============================================================================*/ -#endif - #endif /* _Aspect_Drawable_HeaderFile */ diff --git a/src/Aspect/Aspect_FStream.cxx b/src/Aspect/Aspect_FStream.cxx deleted file mode 100644 index aeeba01392..0000000000 --- a/src/Aspect/Aspect_FStream.cxx +++ /dev/null @@ -1,24 +0,0 @@ -// Created on: 1994-08-24 -// Created by: Modelistation -// Copyright (c) 1994-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& STANDARD_TYPE(Aspect_FStream) -{ - static Handle(Standard_Type) _atype = - new Standard_Type("Aspect_FStream",sizeof(Aspect_FStream)); - return _atype; -} diff --git a/src/Aspect/Aspect_FStream.hxx b/src/Aspect/Aspect_FStream.hxx index e16618228e..3731967541 100644 --- a/src/Aspect/Aspect_FStream.hxx +++ b/src/Aspect/Aspect_FStream.hxx @@ -19,7 +19,4 @@ typedef ofstream* Aspect_FStream; -#include -const Handle(Standard_Type)& STANDARD_TYPE(Aspect_FStream); - #endif diff --git a/src/Aspect/Aspect_GraphicCallbackProc.hxx b/src/Aspect/Aspect_GraphicCallbackProc.hxx index adeb3cdc83..2092de81e4 100644 --- a/src/Aspect/Aspect_GraphicCallbackProc.hxx +++ b/src/Aspect/Aspect_GraphicCallbackProc.hxx @@ -46,7 +46,4 @@ typedef int (*Aspect_GraphicCallbackProc) (Aspect_Drawable theWind void* theUserData, Aspect_GraphicCallbackStruct* theCallData); -class Handle(Standard_Type); -const Handle(Standard_Type)& STANDARD_TYPE(Aspect_GraphicCallbackProc); - #endif /* _Aspect_GraphicCallbackProc_HeaderFile */ diff --git a/src/Aspect/Aspect_Handle.cxx b/src/Aspect/Aspect_Handle.cxx deleted file mode 100644 index 621839b41e..0000000000 --- a/src/Aspect/Aspect_Handle.cxx +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include -#include - -const Handle(Standard_Type)& STANDARD_TYPE(Aspect_Handle) -{ - static Handle(Standard_Type) _atype = new Standard_Type ("Aspect_Handle", sizeof (Aspect_Handle)); - return _atype; -} diff --git a/src/Aspect/Aspect_Handle.hxx b/src/Aspect/Aspect_Handle.hxx index d00b22adfb..28476ee498 100644 --- a/src/Aspect/Aspect_Handle.hxx +++ b/src/Aspect/Aspect_Handle.hxx @@ -28,14 +28,4 @@ typedef unsigned long Aspect_Handle; #endif /* WNT */ -#if defined(__cplusplus) || defined(c_plusplus) -/*==== Definition de Type ====================================================*/ - -#include -class Handle(Standard_Type); -const Handle(Standard_Type)& STANDARD_TYPE(Aspect_Handle); - -/*============================================================================*/ -#endif - #endif /* _Aspect_Handle_HeaderFile */ diff --git a/src/Aspect/Aspect_IFStream.cxx b/src/Aspect/Aspect_IFStream.cxx deleted file mode 100644 index 90c51f5816..0000000000 --- a/src/Aspect/Aspect_IFStream.cxx +++ /dev/null @@ -1,23 +0,0 @@ -// Created on: 2001-01-26 -// Created by: SPK -// Copyright (c) 2001-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& STANDARD_TYPE(Aspect_IFStream) -{ - static Handle(Standard_Type) _atype = - new Standard_Type("Aspect_IFStream", sizeof(Aspect_IFStream)); - return _atype; -} diff --git a/src/Aspect/Aspect_IFStream.hxx b/src/Aspect/Aspect_IFStream.hxx index 1f10a46d08..bbc18e3e4d 100644 --- a/src/Aspect/Aspect_IFStream.hxx +++ b/src/Aspect/Aspect_IFStream.hxx @@ -18,9 +18,6 @@ #include -typedef ifstream* Aspect_IFStream; - -#include -const Handle(Standard_Type)& STANDARD_TYPE(Aspect_IFStream); +typedef std::ifstream* Aspect_IFStream; #endif diff --git a/src/Aspect/Aspect_RGBPixel.cxx b/src/Aspect/Aspect_RGBPixel.cxx deleted file mode 100644 index e5dfe2f28d..0000000000 --- a/src/Aspect/Aspect_RGBPixel.cxx +++ /dev/null @@ -1,24 +0,0 @@ -// Created on: 1998-10-28 -// Created by: DCB -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& STANDARD_TYPE(Aspect_RGBPixel) -{ - static Handle(Standard_Type) _atype = - new Standard_Type("Aspect_RGBPixel",sizeof(Aspect_RGBPixel)); - return _atype; -} diff --git a/src/Aspect/Aspect_RGBPixel.hxx b/src/Aspect/Aspect_RGBPixel.hxx index 429e8154f1..f934fe380f 100644 --- a/src/Aspect/Aspect_RGBPixel.hxx +++ b/src/Aspect/Aspect_RGBPixel.hxx @@ -14,13 +14,10 @@ #ifndef _Aspect_RGBPixel_HeaderFile #define _Aspect_RGBPixel_HeaderFile -#include typedef struct { float red; float green; float blue; } Aspect_RGBPixel; -const Handle(Standard_Type)& STANDARD_TYPE(Aspect_RGBPixel); - #endif diff --git a/src/Aspect/Aspect_RenderingContext.hxx b/src/Aspect/Aspect_RenderingContext.hxx index 670117a794..7604f681f3 100644 --- a/src/Aspect/Aspect_RenderingContext.hxx +++ b/src/Aspect/Aspect_RenderingContext.hxx @@ -24,14 +24,4 @@ typedef void* Aspect_RenderingContext; /* GLXContext under UNIX */ /* HGLRC under WNT */ -#if defined(__cplusplus) || defined(c_plusplus) -/*==== Definition de Type ====================================================*/ - -#include -class Handle(Standard_Type); -const Handle(Standard_Type)& STANDARD_TYPE(Aspect_RenderingContext); - -/*============================================================================*/ -#endif - #endif /* _Aspect_RenderingContext_HeaderFile */ diff --git a/src/Aspect/FILES b/src/Aspect/FILES index 42080a3125..53557365ed 100755 --- a/src/Aspect/FILES +++ b/src/Aspect/FILES @@ -2,14 +2,9 @@ EXTERNLIB Aspect_WOKSteps.edl Aspect_CMPLRS.edl Aspect_FStream.hxx -Aspect_FStream.cxx Aspect_IFStream.hxx -Aspect_IFStream.cxx Aspect_CLayer2d.hxx -Aspect_CLayer2d.cxx Aspect_RGBPixel.hxx -Aspect_RGBPixel.cxx -Aspect_Handle.cxx Aspect_Handle.hxx Aspect_XWD.hxx Aspect_Units.hxx diff --git a/src/DBC/DBC_BaseArray.cdl b/src/DBC/DBC_BaseArray.cdl index 5e1632e9b8..49e17114d5 100644 --- a/src/DBC/DBC_BaseArray.cdl +++ b/src/DBC/DBC_BaseArray.cdl @@ -52,15 +52,6 @@ is Unlock (me) is static; ---Purpose: unlocks the array from memory - - ShallowDump (me; S: in out OStream) - --Purpose: Prints the contents at the first level of on - -- the stream . The Root version of ShallowDump prints - -- the name of the class is an instance of, - -- followed by its memory address. - ---C++: function call - is redefined; - fields mySize : Integer is protected; diff --git a/src/DBC/DBC_BaseArray.cxx b/src/DBC/DBC_BaseArray.cxx index 7ba214c54b..50c2927b8e 100644 --- a/src/DBC/DBC_BaseArray.cxx +++ b/src/DBC/DBC_BaseArray.cxx @@ -79,18 +79,6 @@ static PStandard_ArrayNode DBC_tmpItem; // Last revision : January 1996 JMS/CLE // portage OBJY 3.8 - - - -// -------------------------------------------------------------------- -// ShallowDump -// -------------------------------------------------------------------- -//void DBC_BaseArray::ShallowDump( Standard_OStream& S) const -void DBC_BaseArray::ShallowDump( Standard_OStream& ) const -{ -} - - // -------------------------------------------------------------------- // Constructor // -------------------------------------------------------------------- diff --git a/src/DBC/DBC_BaseArray_objs.hxx b/src/DBC/DBC_BaseArray_objs.hxx index b1475cef51..4a92465d00 100644 --- a/src/DBC/DBC_BaseArray_objs.hxx +++ b/src/DBC/DBC_BaseArray_objs.hxx @@ -33,8 +33,6 @@ class Standard_DimensionMismatch; #endif #endif -Handle_Standard_Type& DBC_BaseArray_Type_(); - class Standard_EXPORT DBC_BaseArray : public os_virtual_behavior /* New */ { @@ -49,21 +47,12 @@ DBC_BaseArray(const DBC_BaseArray& BaseArray); Standard_Integer Upper() const; Standard_Address Lock() const; void Unlock() const; -virtual void ShallowDump(Standard_OStream& S) const; void Destroy() ; ~DBC_BaseArray() { Destroy(); } - - - - - // Type management - // - friend Handle_Standard_Type& DBC_BaseArray_Type_(); - protected: // Methods PROTECTED @@ -91,14 +80,4 @@ private: #include - - -// other Inline functions and methods (like "C++: function call" methods) -// -void ShallowDump(const DBC_BaseArray& me,Standard_OStream& S) { - me.ShallowDump(S); -} - - - #endif diff --git a/src/DDataStd/DDataStd_BasicCommands.cxx b/src/DDataStd/DDataStd_BasicCommands.cxx index 333dd27e9b..1f66be606d 100644 --- a/src/DDataStd/DDataStd_BasicCommands.cxx +++ b/src/DDataStd/DDataStd_BasicCommands.cxx @@ -374,8 +374,6 @@ static Standard_Integer DDataStd_GetUAttribute (Draw_Interpretor& di, di << "No UAttribute Attribute on label" << "\n"; } else { -// UA->ID().ShallowDump(cout); -// cout << endl; char *aStrGUID = new char[37]; UA->ID().ToCString(aStrGUID); di << aStrGUID; diff --git a/src/Graphic3d/FILES b/src/Graphic3d/FILES index 30797b356a..ba0abf07d5 100755 --- a/src/Graphic3d/FILES +++ b/src/Graphic3d/FILES @@ -5,27 +5,16 @@ Graphic3d_CAspectText.hxx Graphic3d_CStructure.cxx Graphic3d_CStructure.hxx Graphic3d_CStructure_Handle.hxx -Graphic3d_CBitFields16.cxx Graphic3d_CBitFields16.hxx -Graphic3d_CBitFields20.cxx Graphic3d_CBitFields20.hxx -Graphic3d_CBitFields8.cxx Graphic3d_CBitFields8.hxx -Graphic3d_CBitFields4.cxx Graphic3d_CBitFields4.hxx -Graphic3d_CTexture.cxx Graphic3d_CTexture.hxx -Graphic3d_CLight.cxx Graphic3d_CLight.hxx -Graphic3d_CPick.cxx Graphic3d_CPick.hxx -Graphic3d_CBounds.cxx Graphic3d_CBounds.hxx -Graphic3d_CUserDraw.cxx Graphic3d_CUserDraw.hxx -Graphic3d_CView.cxx Graphic3d_CView.hxx -Graphic3d_CGraduatedTrihedron.cxx Graphic3d_CGraduatedTrihedron.hxx Graphic3d_Structure.lxx Graphic3d_Structure.pxx @@ -48,7 +37,6 @@ Graphic3d_WOKSteps.edl Graphic3d_PrimitiveArray.hxx Graphic3d_TransModeFlags.hxx Graphic3d_CTransPersStruct.hxx -Graphic3d_CTransPersStruct.cxx Graphic3d_NListOfHAsciiString.hxx Graphic3d_AspectText3d.cxx Graphic3d_PtrFrameBuffer.hxx diff --git a/src/Graphic3d/Graphic3d_CBitFields16.cxx b/src/Graphic3d/Graphic3d_CBitFields16.cxx deleted file mode 100644 index 40891a2e13..0000000000 --- a/src/Graphic3d/Graphic3d_CBitFields16.cxx +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) 1995-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& STANDARD_TYPE(Graphic3d_CBitFields16) -{ - static Handle(Standard_Type) _atype = - new Standard_Type ("Graphic3d_CBitFields16", sizeof (Graphic3d_CBitFields16)); - return _atype; -} diff --git a/src/Graphic3d/Graphic3d_CBitFields16.hxx b/src/Graphic3d/Graphic3d_CBitFields16.hxx index db39f14538..e782ff9315 100644 --- a/src/Graphic3d/Graphic3d_CBitFields16.hxx +++ b/src/Graphic3d/Graphic3d_CBitFields16.hxx @@ -46,11 +46,4 @@ typedef struct { } Graphic3d_CBitFields16; -#if defined(__cplusplus) || defined(c_plusplus) -/*==== Definition de Type ====================================================*/ -#include -const Handle(Standard_Type)& STANDARD_TYPE(Graphic3d_CBitFields16); -/*============================================================================*/ - -#endif #endif /*Graphic3d_CBitFields16_HeaderFile*/ diff --git a/src/Graphic3d/Graphic3d_CBitFields20.cxx b/src/Graphic3d/Graphic3d_CBitFields20.cxx deleted file mode 100644 index 3c078b35a8..0000000000 --- a/src/Graphic3d/Graphic3d_CBitFields20.cxx +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) 1995-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& STANDARD_TYPE(Graphic3d_CBitFields20) -{ - static Handle(Standard_Type) _atype = - new Standard_Type ("Graphic3d_CBitFields20", sizeof (Graphic3d_CBitFields20)); - return _atype; -} diff --git a/src/Graphic3d/Graphic3d_CBitFields20.hxx b/src/Graphic3d/Graphic3d_CBitFields20.hxx index 22fdb02faa..baae724cb0 100644 --- a/src/Graphic3d/Graphic3d_CBitFields20.hxx +++ b/src/Graphic3d/Graphic3d_CBitFields20.hxx @@ -51,11 +51,4 @@ typedef struct { } Graphic3d_CBitFields20; -#if defined(__cplusplus) || defined(c_plusplus) -/*==== Definition de Type ====================================================*/ -#include -const Handle(Standard_Type)& STANDARD_TYPE(Graphic3d_CBitFields20); -/*============================================================================*/ - -#endif #endif /*Graphic3d_CBitFields20_HeaderFile*/ diff --git a/src/Graphic3d/Graphic3d_CBitFields4.cxx b/src/Graphic3d/Graphic3d_CBitFields4.cxx deleted file mode 100644 index 9f115e53f0..0000000000 --- a/src/Graphic3d/Graphic3d_CBitFields4.cxx +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) 1995-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& STANDARD_TYPE(Graphic3d_CBitFields4) -{ - static Handle(Standard_Type) _atype = - new Standard_Type ("Graphic3d_CBitFields4", sizeof (Graphic3d_CBitFields4)); - return _atype; -} diff --git a/src/Graphic3d/Graphic3d_CBitFields4.hxx b/src/Graphic3d/Graphic3d_CBitFields4.hxx index ff43795812..1ed61a0804 100644 --- a/src/Graphic3d/Graphic3d_CBitFields4.hxx +++ b/src/Graphic3d/Graphic3d_CBitFields4.hxx @@ -31,11 +31,4 @@ typedef struct { } Graphic3d_CBitFields4; -#if defined(__cplusplus) || defined(c_plusplus) -/*==== Definition de Type ====================================================*/ -#include -const Handle(Standard_Type)& STANDARD_TYPE(Graphic3d_CBitFields4); -/*============================================================================*/ - -#endif #endif /*Graphic3d_CBitFields4_HeaderFile*/ diff --git a/src/Graphic3d/Graphic3d_CBitFields8.cxx b/src/Graphic3d/Graphic3d_CBitFields8.cxx deleted file mode 100644 index ee2a42cda2..0000000000 --- a/src/Graphic3d/Graphic3d_CBitFields8.cxx +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) 1995-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& STANDARD_TYPE(Graphic3d_CBitFields8) -{ - static Handle(Standard_Type) _atype = - new Standard_Type ("Graphic3d_CBitFields8", sizeof (Graphic3d_CBitFields8)); - return _atype; -} diff --git a/src/Graphic3d/Graphic3d_CBitFields8.hxx b/src/Graphic3d/Graphic3d_CBitFields8.hxx index dbd9d17da7..ceeef3a4aa 100644 --- a/src/Graphic3d/Graphic3d_CBitFields8.hxx +++ b/src/Graphic3d/Graphic3d_CBitFields8.hxx @@ -36,11 +36,4 @@ typedef struct { } Graphic3d_CBitFields8; -#if defined(__cplusplus) || defined(c_plusplus) -/*==== Definition de Type ====================================================*/ -#include -const Handle(Standard_Type)& STANDARD_TYPE(Graphic3d_CBitFields8); -/*============================================================================*/ - -#endif #endif /*Graphic3d_CBitFields8_HeaderFile*/ diff --git a/src/Graphic3d/Graphic3d_CBounds.cxx b/src/Graphic3d/Graphic3d_CBounds.cxx deleted file mode 100644 index 96661222e0..0000000000 --- a/src/Graphic3d/Graphic3d_CBounds.cxx +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& TYPE(Graphic3d_CBounds) -{ - static Handle(Standard_Type) _atype = - new Standard_Type ("Graphic3d_CBounds", sizeof (Graphic3d_CBounds)); - return _atype; -} diff --git a/src/Graphic3d/Graphic3d_CBounds.hxx b/src/Graphic3d/Graphic3d_CBounds.hxx index af9f26fc1d..f3b5cb8b2e 100644 --- a/src/Graphic3d/Graphic3d_CBounds.hxx +++ b/src/Graphic3d/Graphic3d_CBounds.hxx @@ -24,11 +24,4 @@ #include typedef CALL_DEF_BOUNDS Graphic3d_CBounds; -#if defined(__cplusplus) || defined(c_plusplus) -/*==== Definition de Type ====================================================*/ -#include -const Handle(Standard_Type)& TYPE(Graphic3d_CBounds) ; -/*============================================================================*/ - -#endif #endif /*Graphic3d_CBounds_HeaderFile*/ diff --git a/src/Graphic3d/Graphic3d_CGraduatedTrihedron.cxx b/src/Graphic3d/Graphic3d_CGraduatedTrihedron.cxx deleted file mode 100644 index 892b994824..0000000000 --- a/src/Graphic3d/Graphic3d_CGraduatedTrihedron.cxx +++ /dev/null @@ -1,23 +0,0 @@ -// Created on: 2011-03-06 -// Created by: Sergey ZERCHANINOV -// Copyright (c) 2011-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& TYPE(Graphic3d_CGraduatedTrihedron) -{ - static Handle(Standard_Type) _atype = - new Standard_Type ("Graphic3d_CGraduatedTrihedron", sizeof (Graphic3d_CGraduatedTrihedron)); - return _atype; -} diff --git a/src/Graphic3d/Graphic3d_CGraduatedTrihedron.hxx b/src/Graphic3d/Graphic3d_CGraduatedTrihedron.hxx index fc0d1f0f41..8c0402d960 100644 --- a/src/Graphic3d/Graphic3d_CGraduatedTrihedron.hxx +++ b/src/Graphic3d/Graphic3d_CGraduatedTrihedron.hxx @@ -18,7 +18,6 @@ #include #include -#include #include #include #include @@ -101,6 +100,4 @@ public: Visual3d_View* ptrVisual3dView; }; -const Handle(Standard_Type)& TYPE(Graphic3d_CGraduatedTrihedron); - #endif /*Graphic3d_CGraduatedTrihedron_HeaderFile*/ diff --git a/src/Graphic3d/Graphic3d_CLight.cxx b/src/Graphic3d/Graphic3d_CLight.cxx deleted file mode 100644 index 71867154cf..0000000000 --- a/src/Graphic3d/Graphic3d_CLight.cxx +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& TYPE(Graphic3d_CLight) -{ - static Handle(Standard_Type) _atype = - new Standard_Type ("Graphic3d_CLight", sizeof (Graphic3d_CLight)); - return _atype; -} diff --git a/src/Graphic3d/Graphic3d_CLight.hxx b/src/Graphic3d/Graphic3d_CLight.hxx index 3b70231af3..3854072e33 100644 --- a/src/Graphic3d/Graphic3d_CLight.hxx +++ b/src/Graphic3d/Graphic3d_CLight.hxx @@ -17,7 +17,6 @@ #include #include #include -#include //! Light definition struct Graphic3d_CLight diff --git a/src/Graphic3d/Graphic3d_CPick.cxx b/src/Graphic3d/Graphic3d_CPick.cxx deleted file mode 100644 index 81e53bad9a..0000000000 --- a/src/Graphic3d/Graphic3d_CPick.cxx +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& TYPE(Graphic3d_CPick) -{ - static Handle(Standard_Type) _atype = - new Standard_Type ("Graphic3d_CPick", sizeof (Graphic3d_CPick)); - return _atype; -} diff --git a/src/Graphic3d/Graphic3d_CPick.hxx b/src/Graphic3d/Graphic3d_CPick.hxx index 74d85ffde0..7f51502730 100644 --- a/src/Graphic3d/Graphic3d_CPick.hxx +++ b/src/Graphic3d/Graphic3d_CPick.hxx @@ -25,12 +25,4 @@ #include typedef CALL_DEF_PICK Graphic3d_CPick; -#if defined(__cplusplus) || defined(c_plusplus) -/*==== Definition de Type ====================================================*/ - -#include -const Handle(Standard_Type)& TYPE(Graphic3d_CPick); -/*============================================================================*/ - -#endif #endif /*Graphic3d_CPick_HeaderFile*/ diff --git a/src/Graphic3d/Graphic3d_CTexture.cxx b/src/Graphic3d/Graphic3d_CTexture.cxx deleted file mode 100644 index 5c3d1baba2..0000000000 --- a/src/Graphic3d/Graphic3d_CTexture.cxx +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& TYPE(Graphic3d_CTexture) -{ - static Handle(Standard_Type) _atype = - new Standard_Type ("Graphic3d_CTexture", sizeof (Graphic3d_CTexture)); - return _atype; -} diff --git a/src/Graphic3d/Graphic3d_CTexture.hxx b/src/Graphic3d/Graphic3d_CTexture.hxx index 33dcb73ef9..edea7f6ccb 100644 --- a/src/Graphic3d/Graphic3d_CTexture.hxx +++ b/src/Graphic3d/Graphic3d_CTexture.hxx @@ -15,7 +15,6 @@ #define _Graphic3d_CTexture_HeaderFile #include -#include class Graphic3d_CTexture { @@ -35,6 +34,4 @@ public: }; -const Handle(Standard_Type)& TYPE(Graphic3d_CTexture); - #endif // Graphic3d_CTexture_HeaderFile diff --git a/src/Graphic3d/Graphic3d_CTransPersStruct.cxx b/src/Graphic3d/Graphic3d_CTransPersStruct.cxx deleted file mode 100644 index fbcf148b4b..0000000000 --- a/src/Graphic3d/Graphic3d_CTransPersStruct.cxx +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& TYPE(Graphic3d_CTransPersStruct) -{ - static Handle(Standard_Type) _atype = - new Standard_Type ("Graphic3d_CTransPersStruct", sizeof (Graphic3d_CTransPersStruct)); - return _atype; -} diff --git a/src/Graphic3d/Graphic3d_CTransPersStruct.hxx b/src/Graphic3d/Graphic3d_CTransPersStruct.hxx index d72b214b94..b7bb0f4ebb 100644 --- a/src/Graphic3d/Graphic3d_CTransPersStruct.hxx +++ b/src/Graphic3d/Graphic3d_CTransPersStruct.hxx @@ -24,11 +24,4 @@ #include typedef CALL_DEF_TRANSFORM_PERSISTENCE Graphic3d_CTransPersStruct; -#if defined(__cplusplus) || defined(c_plusplus) -/*==== Definition de Type ====================================================*/ -#include -const Handle(Standard_Type)& TYPE(Graphic3d_CTransPersStruct); -/*============================================================================*/ - -#endif #endif /*_Graphic3d_CTransPersStruct_HeaderFile*/ diff --git a/src/Graphic3d/Graphic3d_CUserDraw.cxx b/src/Graphic3d/Graphic3d_CUserDraw.cxx deleted file mode 100644 index 08498948d6..0000000000 --- a/src/Graphic3d/Graphic3d_CUserDraw.cxx +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& TYPE(Graphic3d_CUserDraw) -{ - static Handle(Standard_Type) _atype = - new Standard_Type ("Graphic3d_CUserDraw", sizeof (Graphic3d_CUserDraw)); - return _atype; -} diff --git a/src/Graphic3d/Graphic3d_CUserDraw.hxx b/src/Graphic3d/Graphic3d_CUserDraw.hxx index 8d2f2409f1..3151b7017d 100644 --- a/src/Graphic3d/Graphic3d_CUserDraw.hxx +++ b/src/Graphic3d/Graphic3d_CUserDraw.hxx @@ -24,11 +24,4 @@ #include typedef CALL_DEF_USERDRAW Graphic3d_CUserDraw; -#if defined(__cplusplus) || defined(c_plusplus) -/*==== Definition de Type ====================================================*/ -#include -const Handle(Standard_Type)& TYPE(Graphic3d_CUserDraw) ; -/*============================================================================*/ - -#endif #endif /*Graphic3d_CUserDraw_HeaderFile*/ diff --git a/src/Graphic3d/Graphic3d_CView.cxx b/src/Graphic3d/Graphic3d_CView.cxx deleted file mode 100644 index 98d5d067b3..0000000000 --- a/src/Graphic3d/Graphic3d_CView.cxx +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle(Standard_Type)& TYPE(Graphic3d_CView) -{ - static Handle(Standard_Type) _atype = - new Standard_Type ("Graphic3d_CView", sizeof (Graphic3d_CView)); - return _atype; -} diff --git a/src/Graphic3d/Graphic3d_CView.hxx b/src/Graphic3d/Graphic3d_CView.hxx index e5cf2998af..980a4ada22 100644 --- a/src/Graphic3d/Graphic3d_CView.hxx +++ b/src/Graphic3d/Graphic3d_CView.hxx @@ -19,7 +19,6 @@ #include #include -#include #include #include @@ -149,6 +148,4 @@ public: }; -const Handle(Standard_Type)& TYPE(Graphic3d_CView); - #endif // Graphic3d_CView_HeaderFile diff --git a/src/IFSelect/FILES b/src/IFSelect/FILES index 5c260f3f12..e40b5c5800 100755 --- a/src/IFSelect/FILES +++ b/src/IFSelect/FILES @@ -1,2 +1 @@ IFSelect_ActFunc.hxx -IFSelect_ActFunc.cxx diff --git a/src/IFSelect/IFSelect_ActFunc.cxx b/src/IFSelect/IFSelect_ActFunc.cxx deleted file mode 100644 index aa6f0a16aa..0000000000 --- a/src/IFSelect/IFSelect_ActFunc.cxx +++ /dev/null @@ -1,30 +0,0 @@ -// Created on: 2000-02-29 -// Created by: data exchange team -// Copyright (c) 2000-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -//======================================================================= -//function : IFSelect_ActFunc_Type_ -//purpose : -//======================================================================= - -Handle(Standard_Type)& STANDARD_TYPE(IFSelect_ActFunc) -{ - static Handle(Standard_Type) _aType = - new Standard_Type("IFSelect_ActFunc", sizeof(IFSelect_ActFunc), 0, NULL); - - return _aType; -} - diff --git a/src/IFSelect/IFSelect_ActFunc.hxx b/src/IFSelect/IFSelect_ActFunc.hxx index f21dde2e60..250e98d7ec 100644 --- a/src/IFSelect/IFSelect_ActFunc.hxx +++ b/src/IFSelect/IFSelect_ActFunc.hxx @@ -16,12 +16,9 @@ #ifndef _IFSelect_ActFunc_HeaderFile #define _IFSelect_ActFunc_HeaderFile -#include #include #include typedef IFSelect_ReturnStatus (*IFSelect_ActFunc) (const Handle(IFSelect_SessionPilot)&); -Standard_EXPORT Handle(Standard_Type)& STANDARD_TYPE(IFSelect_ActFunc); - #endif diff --git a/src/MoniTool/FILES b/src/MoniTool/FILES index 9451b7bc11..ddfdd434fc 100755 --- a/src/MoniTool/FILES +++ b/src/MoniTool/FILES @@ -1,5 +1,3 @@ MoniTool_ValueInterpret.hxx -MoniTool_ValueInterpret.cxx MoniTool_ValueSatisfies.hxx -MoniTool_ValueSatisfies.cxx MoniTool_Macros.hxx diff --git a/src/MoniTool/MoniTool_ValueInterpret.cxx b/src/MoniTool/MoniTool_ValueInterpret.cxx deleted file mode 100644 index 4368dbb3c1..0000000000 --- a/src/MoniTool/MoniTool_ValueInterpret.cxx +++ /dev/null @@ -1,30 +0,0 @@ -// Created on: 2000-02-28 -// Created by: data exchange team -// Copyright (c) 2000-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -//======================================================================= -//function : MoniTool_ValueInterpret_Type_ -//purpose : -//======================================================================= - -Handle(Standard_Type)& STANDARD_TYPE(MoniTool_ValueInterpret) -{ - static Handle(Standard_Type) _aType = - new Standard_Type("MoniTool_ValueInterpret", sizeof(MoniTool_ValueInterpret), 0, NULL); - - return _aType; -} - diff --git a/src/MoniTool/MoniTool_ValueInterpret.hxx b/src/MoniTool/MoniTool_ValueInterpret.hxx index 3f16ba52ad..6116d911e6 100644 --- a/src/MoniTool/MoniTool_ValueInterpret.hxx +++ b/src/MoniTool/MoniTool_ValueInterpret.hxx @@ -16,7 +16,6 @@ #ifndef MoniTool_ValueInterpret_HeaderFile #define MoniTool_ValueInterpret_HeaderFile -#include #include class Handle(MoniTool_TypedValue); @@ -25,6 +24,4 @@ typedef Handle(TCollection_HAsciiString) (*MoniTool_ValueInterpret) (const Hand const Handle(TCollection_HAsciiString)& val, const Standard_Boolean native); -Standard_EXPORT Handle(Standard_Type)& STANDARD_TYPE(MoniTool_ValueInterpret); - #endif diff --git a/src/MoniTool/MoniTool_ValueSatisfies.cxx b/src/MoniTool/MoniTool_ValueSatisfies.cxx deleted file mode 100644 index d183223016..0000000000 --- a/src/MoniTool/MoniTool_ValueSatisfies.cxx +++ /dev/null @@ -1,30 +0,0 @@ -// Created on: 2000-02-28 -// Created by: data exchange team -// Copyright (c) 2000-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -//======================================================================= -//function : MoniTool_ValueSatisfies_Type_ -//purpose : -//======================================================================= - -Handle(Standard_Type)& STANDARD_TYPE(MoniTool_ValueSatisfies) -{ - static Handle(Standard_Type) _aType = - new Standard_Type("MoniTool_ValueSatisfies", sizeof(MoniTool_ValueSatisfies), 0, NULL); - - return _aType; -} - diff --git a/src/MoniTool/MoniTool_ValueSatisfies.hxx b/src/MoniTool/MoniTool_ValueSatisfies.hxx index 5036050bb0..499d53e3f9 100644 --- a/src/MoniTool/MoniTool_ValueSatisfies.hxx +++ b/src/MoniTool/MoniTool_ValueSatisfies.hxx @@ -16,11 +16,8 @@ #ifndef MoniTool_ValueSatisfies_HeaderFile #define MoniTool_ValueSatisfies_HeaderFile -#include #include typedef Standard_Boolean (*MoniTool_ValueSatisfies) (const Handle(TCollection_HAsciiString)& val); -Standard_EXPORT Handle(Standard_Type)& STANDARD_TYPE(MoniTool_ValueSatisfies); - #endif diff --git a/src/NCollection/NCollection_UtfString.hxx b/src/NCollection/NCollection_UtfString.hxx index 303d3b200f..f8cfa3f92e 100755 --- a/src/NCollection/NCollection_UtfString.hxx +++ b/src/NCollection/NCollection_UtfString.hxx @@ -20,7 +20,7 @@ #include -#include +#include #include //! This template class represent constant UTF-* string. @@ -240,7 +240,7 @@ private: //! @name low-level methods const Standard_Byte* theStrSrc, const Standard_Integer theSizeBytes) { - ::memcpy (theStrDst, theStrSrc, (Standard_Size )theSizeBytes); + std::memcpy (theStrDst, theStrSrc, (Standard_Size )theSizeBytes); } //! Compare two Unicode strings per-byte. @@ -250,7 +250,7 @@ private: //! @name low-level methods const Standard_Integer theSizeBytes2) { return (theSizeBytes1 == theSizeBytes2) - && (::memcmp (theString1, theString2, (Standard_Size )theSizeBytes1) == 0); + && (std::memcmp (theString1, theString2, (Standard_Size )theSizeBytes1) == 0); } private: //! @name private fields diff --git a/src/OSD/FILES b/src/OSD/FILES index 1b08d1ea2f..57865f5ac1 100755 --- a/src/OSD/FILES +++ b/src/OSD/FILES @@ -1,6 +1,5 @@ EXTERNLIB OSD_CMPLRS.edl -OSD_Function.cxx OSD_Function.hxx OSD_ErrorList.hxx OSD_WNT.cxx diff --git a/src/OSD/OSD_Function.cxx b/src/OSD/OSD_Function.cxx deleted file mode 100644 index f7ed306b6f..0000000000 --- a/src/OSD/OSD_Function.cxx +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -const Handle_Standard_Type& OSD_Function_Type_() -{ - static Handle_Standard_Type _aType = - new Standard_Type("OSD_Function",sizeof(OSD_Function)); - - return _aType; -} diff --git a/src/OSD/OSD_Function.hxx b/src/OSD/OSD_Function.hxx index bb357c9881..cb9aed710f 100644 --- a/src/OSD/OSD_Function.hxx +++ b/src/OSD/OSD_Function.hxx @@ -15,9 +15,6 @@ #ifndef OSD_Function_HeaderFile #define OSD_Function_HeaderFile -#include -const Handle_Standard_Type& OSD_Function_Type_(); - typedef int (* OSD_Function)(...); #endif diff --git a/src/OSD/OSD_MAllocHook.cxx b/src/OSD/OSD_MAllocHook.cxx index 9a38f2f8d2..ef54a3824d 100644 --- a/src/OSD/OSD_MAllocHook.cxx +++ b/src/OSD/OSD_MAllocHook.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #include #ifndef SIZE_MAX diff --git a/src/PCollection/PCollection_HArray1.cdl b/src/PCollection/PCollection_HArray1.cdl index 17f1daa3b2..511b1437cb 100644 --- a/src/PCollection/PCollection_HArray1.cdl +++ b/src/PCollection/PCollection_HArray1.cdl @@ -96,18 +96,6 @@ is -- Exceptions -- Standard_OutOfRange if Index is not within the bounds of this array. - ShallowCopy(me) - returns mutable like me - is redefined; - ---Purpose: Returns a new array containing a copy - -- of the values (of the elements) in this array. - - - ShallowDump (me; s: in out OStream) - is redefined; - ---Level: Advanced - ---C++: function call - Field (me)returns FieldOfHArray1 ---Level: Internal is private; diff --git a/src/PCollection/PCollection_HArray1.gxx b/src/PCollection/PCollection_HArray1.gxx index 93edf83897..b7b8432849 100644 --- a/src/PCollection/PCollection_HArray1.gxx +++ b/src/PCollection/PCollection_HArray1.gxx @@ -75,30 +75,6 @@ void PCollection_HArray1::~PCollection_HArray1 () */ - -// ---------------------------------------------------------------------- -// ShallowCopy -// ---------------------------------------------------------------------- - -Handle(Standard_Persistent) PCollection_HArray1::ShallowCopy() const -{ - PCollection_HArray1* TheCopy = new PCollection_HArray1(*this); -// PCollection_FieldOfHArray1 DataCopy (Data); -// TheCopy->Data = DataCopy; - return TheCopy; -} - -// ---------------------------------------------------------------------- -// ShallowDump -// ---------------------------------------------------------------------- - -void PCollection_HArray1::ShallowDump(Standard_OStream& S) const -{ - ::ShallowDump(Data,S); -} - - - /* Anciens INLINE */ // ---------------------------------------------------------------------- diff --git a/src/PCollection/PCollection_HArray2.cdl b/src/PCollection/PCollection_HArray2.cdl index 128929cd3a..c33a4bfbcc 100644 --- a/src/PCollection/PCollection_HArray2.cdl +++ b/src/PCollection/PCollection_HArray2.cdl @@ -121,18 +121,6 @@ is -- Standard_OutOfRange if the index (Row, -- Column) is not within the bounds of this array. - ShallowCopy(me) - returns mutable like me - is redefined; - ---Purpose: Returns a new array containing a copy of the - -- values (of the elements) in this array. - - ShallowDump (me; s: in out OStream) - is redefined; - ---Level: Advanced - ---C++: function call - - Field (me) returns FieldOfHArray2 is private; ---Level: Internal diff --git a/src/PCollection/PCollection_HArray2.gxx b/src/PCollection/PCollection_HArray2.gxx index cacb537103..ab3d501ec7 100644 --- a/src/PCollection/PCollection_HArray2.gxx +++ b/src/PCollection/PCollection_HArray2.gxx @@ -90,29 +90,6 @@ void PCollection_HArray2::~PCollection_HArray2 () } */ -// -------------------------------------------------------------------- -// ShallowCopy -// -------------------------------------------------------------------- -Handle(Standard_Persistent) PCollection_HArray2::ShallowCopy() const -{ - PCollection_HArray2* TheCopy = new PCollection_HArray2(*this); -// PCollection_FieldOfHArray2 DataCopy (Data); -// TheCopy->Data = DataCopy; - return TheCopy; -} - -// -------------------------------------------------------------------- -// ShallowDump -// -------------------------------------------------------------------- -void PCollection_HArray2::ShallowDump(Standard_OStream& S) const -{ - ::ShallowDump(Data,S); -} - - - - - /* Anciens INLINE */ // -------------------------------------------------------------------- diff --git a/src/PCollection/PCollection_HAsciiString.cdl b/src/PCollection/PCollection_HAsciiString.cdl index 1dac147ebd..c34c2b89b9 100644 --- a/src/PCollection/PCollection_HAsciiString.cdl +++ b/src/PCollection/PCollection_HAsciiString.cdl @@ -439,11 +439,6 @@ is ---Purpose: Returns the character of index Index of the string ---Example: me = "abcd", Index = 2, Value returns 'b'. - ShallowDump (me; s: in out OStream) - is redefined; - ---Level: Advanced - ---C++: function call - Assign(me : mutable ;TheData : VArrayOfCharacter) is private; ---Level: Internal ---Purpose : Assigns the field of the current structure with diff --git a/src/PCollection/PCollection_HAsciiString.cxx b/src/PCollection/PCollection_HAsciiString.cxx index 3ef32217b1..0cd41dbe8f 100644 --- a/src/PCollection/PCollection_HAsciiString.cxx +++ b/src/PCollection/PCollection_HAsciiString.cxx @@ -745,13 +745,3 @@ void PCollection_HAsciiString::Assign(const DBC_VArrayOfCharacter& TheField) { Data = TheField; } - -//------------------------------------------------------------------------ -// ShallowDump -//------------------------------------------------------------------------ -void PCollection_HAsciiString::ShallowDump(Standard_OStream& S) const -{ - S << "begin class HAsciiString " << endl; - ::ShallowDump(Data, S); - S << "end class HAsciiString" << endl; -} diff --git a/src/PCollection/PCollection_HDoubleList.cdl b/src/PCollection/PCollection_HDoubleList.cdl index a8ce9295f2..5591e5b4a4 100644 --- a/src/PCollection/PCollection_HDoubleList.cdl +++ b/src/PCollection/PCollection_HDoubleList.cdl @@ -111,17 +111,6 @@ is ---Level: Public ---Purpose: Modification of the forward pointer - ShallowCopy(me) - returns mutable like me - is redefined; - ---Level: Advanced - ---C++: function call - - ShallowDump (me; s: in out OStream) - is redefined; - ---Level: Advanced - ---C++: function call - Destroy(me : mutable); ---C++: alias ~ diff --git a/src/PCollection/PCollection_HDoubleList.gxx b/src/PCollection/PCollection_HDoubleList.gxx index 38e160c4c2..87728cd257 100644 --- a/src/PCollection/PCollection_HDoubleList.gxx +++ b/src/PCollection/PCollection_HDoubleList.gxx @@ -50,63 +50,6 @@ Handle(PCollection_HDoubleList) return L; // C'est L qui est retourne. } - -// ----------------------------------------------------------------------- -// - - -// - - -// - - -// ----------------------------------------------------------------------- -Handle(Standard_Persistent) PCollection_HDoubleList::ShallowCopy() const -{ - - Handle(PCollection_HDoubleList) TheList, // Traversal depth of - TheCopy, // The list returned - Pred, // Backward pointer - Succ, // Forward pointer - Last; // Last cell - - TheCopy = new PCollection_HDoubleList; // Initialization of the list - // that will be returned - Standard_Boolean FirstTime = Standard_True; - - TheList = this; // Start at the beginning - Pred = Succ = TheCopy; - - while ( ! TheList->IsEmpty() ) { // Append each item at the - Succ = Succ->Construct(TheList->Value()); // end of the list - if ( FirstTime ){ - FirstTime = Standard_False; - TheCopy = Succ; - } - else{ - Pred->ChangeForwardPointer(Succ); // Make the link between - Succ->ChangeBackPointer(Pred); // Pred and Succ - } - Pred = Succ; - Succ = Succ->Tail(); - TheList = TheList->Tail(); - } - return TheCopy; // Returns the header -} - -// ----------------------------------------------------------------------- -// - - -// - - -// - - -// ----------------------------------------------------------------------- -void PCollection_HDoubleList::ShallowDump(Standard_OStream& S) const -{ - Handle(PCollection_HDoubleList) TheList; - TheList = this; - S << "begin class HDoubleList " << endl; - while ( ! TheList->IsEmpty() ) { - ::ShallowDump(TheList->Value(), S); - TheList = TheList->Tail(); - } - S << "end of HDoubleList." << endl; -} - - /* Anciens INLINE */ diff --git a/src/PCollection/PCollection_HExtendedString.cdl b/src/PCollection/PCollection_HExtendedString.cdl index ebbde5171c..6e42e65415 100644 --- a/src/PCollection/PCollection_HExtendedString.cdl +++ b/src/PCollection/PCollection_HExtendedString.cdl @@ -280,12 +280,6 @@ is ---Purpose: Returns the character of index Index of the string. ---Example: me = "abcd", Index = 2, Value returns 'b' - ShallowDump (me; s: in out OStream) - is redefined; - ---Level: Advanced - ---C++: function call - - Assign(me : mutable ;TheData : VArrayOfExtCharacter) is private; ---Level: Internal ---Purpose : Assigns the field of the current structure with diff --git a/src/PCollection/PCollection_HExtendedString.cxx b/src/PCollection/PCollection_HExtendedString.cxx index 531e007f8f..971c053b50 100644 --- a/src/PCollection/PCollection_HExtendedString.cxx +++ b/src/PCollection/PCollection_HExtendedString.cxx @@ -567,17 +567,6 @@ Standard_ExtCharacter PCollection_HExtendedString::Value return Data(Index-1); } -//------------------------------------------------------------------------ -// ShallowDump -//------------------------------------------------------------------------ -void PCollection_HExtendedString::ShallowDump(Standard_OStream& S) const -{ - S << "begin class HExtendedString " << endl; - ::ShallowDump(Data, S); - S << "end class HExtendedString" << endl; -} - - //------------------------------------------------------------------------ // Assign //------------------------------------------------------------------------ diff --git a/src/PCollection/PCollection_HSequence.cdl b/src/PCollection/PCollection_HSequence.cdl index 2d4c91a340..d77b265a8a 100644 --- a/src/PCollection/PCollection_HSequence.cdl +++ b/src/PCollection/PCollection_HSequence.cdl @@ -401,19 +401,6 @@ is returns SeqNode is private; - ShallowCopy(me) - returns mutable like me - is redefined; - ---Level: Advanced - ---C++: function call - - - ShallowDump (me; s: in out OStream) - is redefined; - ---Level: Advanced - ---C++: function call - - Destroy(me : mutable); ---C++: alias ~ diff --git a/src/PCollection/PCollection_HSequence.gxx b/src/PCollection/PCollection_HSequence.gxx index 1c37fa07b0..c646fde1a3 100644 --- a/src/PCollection/PCollection_HSequence.gxx +++ b/src/PCollection/PCollection_HSequence.gxx @@ -426,52 +426,6 @@ Item PCollection_HSequence::Last() const return LastItem->Value(); } - -// ---------------------------------------------------- -// -// ShallowCopy -// -// ---------------------------------------------------- -Handle(Standard_Persistent) PCollection_HSequence::ShallowCopy() const -{ - Handle (PCollection_HSequence) TheCopy ; - Handle (PCollection_SeqNode) TheList ; - -#ifndef OBJS - TheCopy = new PCollection_HSequence; -#else - TheCopy = new (os_segment::of(this)) PCollection_HSequence; -#endif - TheList = FirstItem; - for (Standard_Integer I = 1; I <= Size; I++) { - TheCopy->Append(TheList->Value()); - TheList = TheList->Next(); - } - - return TheCopy; - -} - -// ---------------------------------------------------- -// -// ShallowDump -// ---------------------------------------------------- -void PCollection_HSequence::ShallowDump(Standard_OStream& S) const -{ - S << "begin class Sequence "<< endl; - S << "Size : "<< Size << "element(s)." << endl; - Standard_Integer i = 1; - Handle(PCollection_SeqNode) cell = FirstItem; - while ( !cell.IsNull() ) { - S << "Index : "<< i << endl; -// ::ShallowDump(cell->Value(),S); - cell = cell->Next(); - ++i; - } - S << "end class Sequence" << endl; -} - - // IsEmpty : Returns Standard_True if the sequence is empty (i.e. Size = 0) Standard_Boolean PCollection_HSequence::IsEmpty() const { diff --git a/src/PCollection/PCollection_HSingleList.cdl b/src/PCollection/PCollection_HSingleList.cdl index 67268a56bf..8eab7dc398 100644 --- a/src/PCollection/PCollection_HSingleList.cdl +++ b/src/PCollection/PCollection_HSingleList.cdl @@ -93,20 +93,6 @@ is ---Level: Public ---Purpose: Modification of the node link. - ShallowCopy(me) - returns mutable like me - is redefined; - ---Level: Advanced - ---C++: function call - - - ShallowDump (me; s: in out OStream) - is redefined; - ---Level: Advanced - ---C++: function call - - - fields Data : Item; Next : HSingleList; diff --git a/src/PCollection/PCollection_HSingleList.gxx b/src/PCollection/PCollection_HSingleList.gxx index 6ff790d110..ad6a0a7a9c 100644 --- a/src/PCollection/PCollection_HSingleList.gxx +++ b/src/PCollection/PCollection_HSingleList.gxx @@ -59,68 +59,6 @@ Handle(PCollection_HSingleList) return L; } - -// ------------------------------------------------------------------------- -// - -// Shallowcopy : Redefinition of the shallowcopy dump - -// ----------- - - -// - -// ------------------------------------------------------------------------- -Handle(Standard_Persistent) PCollection_HSingleList::ShallowCopy() const -{ - Handle(PCollection_HSingleList) TheList, // Traversal depth of - TheCopy, // The list returned - Pred, // Backward pointer - Succ; // Forward pointer -#ifndef OBJS - TheCopy = new PCollection_HSingleList; // Initialization of the list -#else - TheCopy = new (os_segment::of(this)) PCollection_HSingleList; // Initialization of the list -#endif - // that will be returned - Standard_Boolean FirstTime = Standard_True; - - TheList = this; // Start at the beginning - Pred = Succ = TheCopy; - - while ( ! TheList->IsEmpty() ) { // Append each item at the - Succ = Succ->Construct(TheList->Value()); // end of the list - if ( FirstTime ){ - FirstTime = Standard_False; - TheCopy = Succ; - } - else{ - Pred->ChangeForwardPointer(Succ); // Make the link between - } // Pred and Succ - Pred = Succ; - Succ = Succ->Tail(); - TheList = TheList->Tail(); - } - return TheCopy; // Returns the header -} - -// ------------------------------------------------------------------------- -// - -// ShallowDump Redefinition of the shallowdump method - -// ----------- - -// - -// ------------------------------------------------------------------------- -void PCollection_HSingleList::ShallowDump(Standard_OStream& S) const -{ - Handle(PCollection_HSingleList) TheList; - TheList = this; - S << "begin class HSingleList " << endl; - while ( ! TheList->IsEmpty() ) { - ::ShallowDump(TheList->Value(), S); - TheList = TheList->Tail(); - } - S << "end class HSingleList" << endl; - -} - - - /* Anciens INLINE */ Item PCollection_HSingleList::Value() const { diff --git a/src/PMMgt/PMMgt_PManaged.cxx b/src/PMMgt/PMMgt_PManaged.cxx index 3826812802..24a90c6d3f 100644 --- a/src/PMMgt/PMMgt_PManaged.cxx +++ b/src/PMMgt/PMMgt_PManaged.cxx @@ -15,14 +15,6 @@ #include #include -#ifdef TRACE -#define PRINT(X) cout X -#define SHALLOWDUMP(X) X.ShallowDump(cout) -#else -#define PRINT(X) -#define SHALLOWDUMP(X) -#endif - PMMgt_PManaged::PMMgt_PManaged() { } diff --git a/src/SWDRAW/SWDRAW.cxx b/src/SWDRAW/SWDRAW.cxx index ea9b7be54b..58e02257d9 100644 --- a/src/SWDRAW/SWDRAW.cxx +++ b/src/SWDRAW/SWDRAW.cxx @@ -106,11 +106,9 @@ static Standard_Integer LocDump (Draw_Interpretor& di, Standard_Integer argc, co TopLoc_Location L = a.Location(); di << "Location of shape " << argv[1] << ":" << "\n"; -// L.ShallowDump ( di ); di << "Results in:" << "\n"; gp_Trsf T = L.Transformation(); TopLoc_Location l ( T ); - //l.ShallowDump ( di ); Standard_SStream aSStream; l.ShallowDump ( aSStream ); di << aSStream; diff --git a/src/ShapeProcess/FILES b/src/ShapeProcess/FILES index 0811dc8940..cef0b22f85 100755 --- a/src/ShapeProcess/FILES +++ b/src/ShapeProcess/FILES @@ -1,3 +1,2 @@ ShapeProcess_OperFunc.hxx -ShapeProcess_OperFunc.cxx diff --git a/src/ShapeProcess/ShapeProcess_OperFunc.cxx b/src/ShapeProcess/ShapeProcess_OperFunc.cxx deleted file mode 100644 index c41e66d143..0000000000 --- a/src/ShapeProcess/ShapeProcess_OperFunc.cxx +++ /dev/null @@ -1,30 +0,0 @@ -// Created on: 2000-08-22 -// Created by: data exchange team -// Copyright (c) 2000-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include - -//======================================================================= -//function : MoniFrame_OperFunc_Type_ -//purpose : -//======================================================================= -/* -Handle(Standard_Type)& STANDARD_TYPE(ShapeProcess_OperFunc) -{ - static Handle(Standard_Type) _aType = - new Standard_Type("MoniFrame_OperFunc", sizeof(ShapeProcess_OperFunc), 0, NULL); - - return _aType; -} -*/ diff --git a/src/ShapeProcess/ShapeProcess_OperFunc.hxx b/src/ShapeProcess/ShapeProcess_OperFunc.hxx index 23fe51b993..4ef07824cc 100644 --- a/src/ShapeProcess/ShapeProcess_OperFunc.hxx +++ b/src/ShapeProcess/ShapeProcess_OperFunc.hxx @@ -16,11 +16,8 @@ #ifndef ShapeProcess_OperFunc_HeaderFile #define ShapeProcess_OperFunc_HeaderFile -#include #include typedef Standard_Boolean (*ShapeProcess_OperFunc) (const Handle(ShapeProcess_Context)& context); -//Standard_EXPORT Handle(Standard_Type)& STANDARD_TYPE(ShapeProcess_OperFunc); - #endif diff --git a/src/Standard/FILES b/src/Standard/FILES index fce77adaf1..61185c354c 100755 --- a/src/Standard/FILES +++ b/src/Standard/FILES @@ -15,9 +15,7 @@ Handle_Standard_Persistent.hxx Handle_Standard_Persistent.cxx Handle_Standard_Transient.cxx Handle_Standard_Transient.hxx -Standard_Address.cxx Standard_Address.hxx -Standard_Boolean.cxx Standard_Boolean.hxx Standard_Byte.hxx Standard_PByte.hxx @@ -25,20 +23,14 @@ Standard_CLocaleSentry.hxx Standard_CLocaleSentry.cxx Standard_CString.cxx Standard_CString.hxx -Standard_Character.cxx Standard_Character.hxx -Standard_ExtCharacter.cxx Standard_ExtCharacter.hxx Standard_ExtString.cxx Standard_ExtString.hxx Standard_HashCode.cxx -Standard_IStream.cxx Standard_IStream.hxx -Standard_Integer.cxx Standard_Integer.hxx Standard_Macro.hxx -Standard_OId.hxx -Standard_OStream.cxx Standard_OStream.hxx Standard_Persistent_proto.hxx Standard_PrimitiveTypes.hxx @@ -46,11 +38,9 @@ Standard_Real.cxx Standard_Real.hxx Standard_SStream.cxx Standard_SStream.hxx -Standard_ShallowDump.cxx Standard_ShortReal.cxx Standard_ShortReal.hxx Standard_Stream.hxx -Standard_Time.cxx Standard_Time.hxx Standard_Transient.hxx Standard_Transient_proto.hxx diff --git a/src/Standard/Handle_Standard_Persistent.hxx b/src/Standard/Handle_Standard_Persistent.hxx index 242e1411cb..9ad299fd9b 100644 --- a/src/Standard/Handle_Standard_Persistent.hxx +++ b/src/Standard/Handle_Standard_Persistent.hxx @@ -92,8 +92,6 @@ class Handle(Standard_Persistent) Standard_EXPORT ~Handle(Standard_Persistent)(); - Standard_EXPORT void ShallowDump(Standard_OStream&) const; - bool operator==(const Handle(Standard_Persistent)& right) const { return entity == right.entity; diff --git a/src/Standard/Standard_Address.cxx b/src/Standard/Standard_Address.cxx deleted file mode 100644 index da08007aa0..0000000000 --- a/src/Standard/Standard_Address.cxx +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include -#include -#ifndef _Standard_OStream_HeaderFile -#include -#endif - -const Handle_Standard_Type& Standard_Address_Type_() -{ - static Handle_Standard_Type _aType = - new Standard_Type("Standard_Address", sizeof(Standard_Address),0,NULL); - - return _aType; -} - - -//============================================================================ -//==== ShallowDump : Writes a CString value. -//============================================================================ -Standard_EXPORT void ShallowDump (const Standard_Address Value, Standard_OStream& s) -{ s << Value << " Standard_Address " << "\n"; } diff --git a/src/Standard/Standard_Address.hxx b/src/Standard/Standard_Address.hxx index 242c9dd93c..2663762049 100644 --- a/src/Standard/Standard_Address.hxx +++ b/src/Standard/Standard_Address.hxx @@ -12,35 +12,11 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -//============================================================================ -//==== Titre: Standard_Address.hxx -//==== Role : The headr file of primitve type "Address" from package "Standard" -//==== -//==== Implementation: This is a primitive type implementadef with typedef -//==== typedef char* Address; -//============================================================================ - #ifndef _Standard_Address_HeaderFile #define _Standard_Address_HeaderFile -# include -//typedef void* Standard_Address; - #include -class Handle_Standard_Type; - -__Standard_API const Handle_Standard_Type& Standard_Address_Type_(); -//class Standard_OStream; -//void ShallowDump (const Standard_Address, Standard_OStream& ); -//============================================================================ -//==== ShallowCopy: Returns a CString -//============================================================================ -inline Standard_Address ShallowCopy (const Standard_Address Value) -{ - return Value; -} - //============================================================================ //==== HashCode : Returns a HashCode CString //============================================================================ diff --git a/src/Standard/Standard_Boolean.cxx b/src/Standard/Standard_Boolean.cxx deleted file mode 100644 index 519cbf1ff9..0000000000 --- a/src/Standard/Standard_Boolean.cxx +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include -#include -#include -#include - -const Handle_Standard_Type& Standard_Boolean_Type_() -{ - static Handle_Standard_Type _aType = - new Standard_Type("Standard_Boolean",sizeof(Standard_Boolean),0,NULL); - - return _aType; -} - -// ------------------------------------------------------------------ -// Hascode : Computes a hascoding value for a given Integer -// ------------------------------------------------------------------ -//Standard_Integer HashCode(const Standard_Boolean me -// ,const Standard_Integer Upper) -//{ -// if (Upper < 1){ -// Standard_RangeError:: -// Raise("Try to apply HashCode method with negative or null argument."); -// } -// return (me % Upper) + 1; -//} - -// ---------------------------------------- -// ShallowCopy : Makes a copy of a boolean -// ---------------------------------------- -Standard_Boolean ShallowCopy (const Standard_Boolean me) -{ return me; } - -// ------------------------------------------------------------------ -// ShallowDump : Writes a boolean value -// ------------------------------------------------------------------ -Standard_EXPORT void ShallowDump (const Standard_Boolean Value, Standard_OStream& s) -{ s << Value << " Standard_Boolean" << "\n"; } diff --git a/src/Standard/Standard_Boolean.hxx b/src/Standard/Standard_Boolean.hxx index a051c214b4..0a680f9a9e 100644 --- a/src/Standard/Standard_Boolean.hxx +++ b/src/Standard/Standard_Boolean.hxx @@ -12,64 +12,11 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -//============================================================================ -//==== Titre: Standard_Boolean.hxx -//==== Role : The headr file of primitve type "Boolean" from package "Standard" -//==== -//==== Implementation: This is a primitive type implementadef with typedef -//==== typedef int Standard_Boolean -//==== #define Standard_False 0 -//==== #define Standard_True 1 -//============================================================================ - #ifndef _Standard_Boolean_HeaderFile #define _Standard_Boolean_HeaderFile -//typedef unsigned int Standard_Boolean; - - -#ifndef _Standard_TypeDef_HeaderFile +//typedef unsigned integer Standard_Boolean; #include -#endif - -class Handle_Standard_Type; - -__Standard_API const Handle_Standard_Type& Standard_Boolean_Type_(); -//class Standard_OStream; -//void ShallowDump (const Standard_Boolean, Standard_OStream& ); -// =============================================== -// Methods from Standard_Entity class which are redefined: -// - Hascode -// - IsEqual -// - IsSimilar -// - Shallowcopy -// - ShallowDump -// =============================================== - - -// ================================== -// Method implemented in Standard_Boolean.cxx -// ================================== -__Standard_API Standard_Boolean ShallowCopy (const Standard_Boolean); -//__Standard_API Standard_Integer HashCode (const Standard_Boolean, const Standard_Integer); - -// =============== -// inline methods -// =============== - -// ------------------------------------------------------------------ -// IsEqual : Returns Standard_True if two booleans have the same value -// ------------------------------------------------------------------ -//inline Standard_Boolean IsEqual(const Standard_Boolean One -// ,const Standard_Boolean Two) -//{ return One == Two; } - -// ------------------------------------------------------------------ -// IsSimilar : Returns Standard_True if two booleans have the same value -// ------------------------------------------------------------------ -inline Standard_Boolean IsSimilar(const Standard_Boolean One - ,const Standard_Boolean Two) -{ return One == Two; } - #endif + diff --git a/src/Standard/Standard_CString.cxx b/src/Standard/Standard_CString.cxx index 1c14f4fb3a..402193677c 100755 --- a/src/Standard/Standard_CString.cxx +++ b/src/Standard/Standard_CString.cxx @@ -27,23 +27,6 @@ #include #include -//============================================================================ -//==== -//============================================================================ -const Handle_Standard_Type& Standard_CString_Type_() -{ - static Handle_Standard_Type _aType = - new Standard_Type("Standard_CString",sizeof(Standard_CString),0,NULL); - - return _aType; -} - -//============================================================================ -//==== ShallowDump : Writes a CString value. -//============================================================================ -Standard_EXPORT void ShallowDump (const Standard_CString Value, Standard_OStream& s) -{ s << Value << " Standard_CString " << "\n"; } - //============================================================================ //==== HashCode of a CString //============================================================================ diff --git a/src/Standard/Standard_CString.hxx b/src/Standard/Standard_CString.hxx index 2602d308bd..eba0c16f49 100644 --- a/src/Standard/Standard_CString.hxx +++ b/src/Standard/Standard_CString.hxx @@ -41,11 +41,7 @@ class Handle_Standard_Type; - -__Standard_API const Handle_Standard_Type& Standard_CString_Type_(); - inline Standard_Integer Abs (const Standard_Integer); -inline Standard_CString ShallowCopy (const Standard_CString Value); inline Standard_Boolean IsSimilar(const Standard_CString One ,const Standard_CString Two); __Standard_API Standard_Integer HashCode (const Standard_CString, @@ -67,14 +63,6 @@ __Standard_API int Printf (const char* theFormat, ...); __Standard_API int Fprintf (FILE* theFile, const char* theFormat, ...); __Standard_API int Sprintf (char* theBuffer, const char* theFormat, ...); -//============================================================================ -//==== ShallowCopy: Returns a CString -//============================================================================ -inline Standard_CString ShallowCopy (const Standard_CString Value) -{ - return Value; -} - //============================================================================ //==== IsSimilar : Returns Standard_True if two booleans have the same value //============================================================================ diff --git a/src/Standard/Standard_Character.cxx b/src/Standard/Standard_Character.cxx deleted file mode 100644 index 7966ed33ba..0000000000 --- a/src/Standard/Standard_Character.cxx +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//============================================================================ -//==== Titre: Standard_Character.cxx -//==== Role : the methodes which raise the exceptions are implemented in -//==== this file. -//============================================================================ -#include -#include -#include -#include -#include -#include -#include - -const Handle_Standard_Type& Standard_Character_Type_() -{ - static Handle_Standard_Type _aType = - new Standard_Type("Standard_Character",sizeof(Standard_Character),0,NULL); - - return _aType; -} - -// ------------------------------------------------------------------ -// Hascode : Computes a hascoding value for a given Character -// ------------------------------------------------------------------ -Standard_Integer HashCode(const Standard_Character me, - const Standard_Integer Upper) -{ - if (Upper < 1){ - Standard_RangeError:: - Raise("Try to apply HashCode method with negative or null argument."); - } - Standard_Character S[2]; - S[0] = me; - S[1] = 0; - return HashCode( atoi(S) , Upper ) ; -} - -// ------------------------------------------------------------------ -// ShallowDump : Writes a character -// ------------------------------------------------------------------ -Standard_EXPORT void ShallowDump (const Standard_Character Value, Standard_OStream& s) -{ - s << Value << " Standard_Character" << endl; -} diff --git a/src/Standard/Standard_Character.hxx b/src/Standard/Standard_Character.hxx index 6b0adfa353..75d8e9313a 100644 --- a/src/Standard/Standard_Character.hxx +++ b/src/Standard/Standard_Character.hxx @@ -29,30 +29,6 @@ #include #include -class Handle_Standard_Type; - -__Standard_API const Handle_Standard_Type& Standard_Character_Type_(); - -//class Standard_OStream; -//void ShallowDump (const Standard_Character, Standard_OStream& ); -// ===================================== -// Method implemented in Standard_Character.cxx -// ===================================== -__Standard_API Standard_Integer HashCode(const Standard_Character, const Standard_Integer); - -// =============================================== -// Methods from Standard_Entity class which are redefined: -// - Hascode -// - IsEqual -// - IsSimilar -// - Shallowcopy -// - ShallowDump -// =============================================== - -// =============== -// inline methods -// =============== - // ------------------------------------------------------------------ // IsEqual : Returns Standard_True if two characters have the same value // ------------------------------------------------------------------ @@ -162,10 +138,4 @@ inline Standard_Character LowerCase(const Standard_Character me) inline Standard_Character UpperCase(const Standard_Character me) { return (Standard_Character)(unsigned char)std::toupper(me); } -// ------------------------------------------------------------------ -// ShallowCopy : Make a copy of one Character -// ------------------------------------------------------------------ -inline Standard_Character ShallowCopy (const Standard_Character me) -{ return me; } - #endif diff --git a/src/Standard/Standard_ExtCharacter.cxx b/src/Standard/Standard_ExtCharacter.cxx deleted file mode 100644 index b47058c661..0000000000 --- a/src/Standard/Standard_ExtCharacter.cxx +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//============================================================================ -//==== Titre: Standard_ExtCharacter.cxx -//==== Role : the methodes which raise the exceptions are implemented in -//==== this file. -//============================================================================ -#include -#include -#include -#include -#include -#include -#include - -const Handle_Standard_Type& Standard_ExtCharacter_Type_() -{ - static Handle_Standard_Type _aType = - new Standard_Type("Standard_ExtCharacter",sizeof(Standard_ExtCharacter), - 0,NULL); - - return _aType; -} - - -// ------------------------------------------------------------------ -// Hascode : Computes a hascoding value for a given ExtCharacter -// ------------------------------------------------------------------ -Standard_Integer HashCode(const Standard_ExtCharacter me, - const Standard_Integer Upper) -{ - if (Upper < 1){ - Standard_RangeError:: - Raise("Try to apply HashCode method with negative or null argument."); - } - Standard_Integer aCode = me; - return ( aCode % Upper) + 1; -} - -// ------------------------------------------------------------------ -// ShallowDump : Writes a character -// ------------------------------------------------------------------ -Standard_EXPORT void ShallowDump (const Standard_ExtCharacter Value - ,Standard_OStream& s) -{ - s << hex << Value << " Standard_ExtCharacter" << endl; -} diff --git a/src/Standard/Standard_ExtCharacter.hxx b/src/Standard/Standard_ExtCharacter.hxx index 35b8ef8d2d..65b7f45636 100644 --- a/src/Standard/Standard_ExtCharacter.hxx +++ b/src/Standard/Standard_ExtCharacter.hxx @@ -29,25 +29,6 @@ #include -class Handle_Standard_Type; - -__Standard_API const Handle_Standard_Type& Standard_ExtCharacter_Type_(); -//class Standard_OStream; -//void ShallowDump (const Standard_ExtCharacter, Standard_OStream& ); -// ===================================== -// Method implemented in Standard_ExtCharacter.cxx -// ===================================== -__Standard_API Standard_Integer HashCode(const Standard_ExtCharacter, const Standard_Integer); - -// =============================================== -// Methods from Standard_Entity class which are redefined: -// - Hascode -// - IsEqual -// - IsSimilar -// - Shallowcopy -// - ShallowDump -// =============================================== - // =============== // inline methods // =============== @@ -92,25 +73,4 @@ inline Standard_Boolean IsSimilar(const Standard_ExtCharacter One, const Standard_ExtCharacter Two) { return One == Two; } - -// ------------------------------------------------------------------ -// ShallowCopy : Make a copy of one Character -// ------------------------------------------------------------------ -inline Standard_ExtCharacter ShallowCopy (const Standard_ExtCharacter me) -{ return me; } - #endif - - - - - - - - - - - - - - diff --git a/src/Standard/Standard_ExtString.cxx b/src/Standard/Standard_ExtString.cxx index 0bcb7c1255..e3f246ea00 100644 --- a/src/Standard/Standard_ExtString.cxx +++ b/src/Standard/Standard_ExtString.cxx @@ -18,25 +18,7 @@ #include #include -#ifndef _Standard_OStream_HeaderFile #include -#endif - -//============================================================================ -//==== ShallowDump : Writes a ExtString value. -//============================================================================ -Standard_EXPORT void ShallowDump (const Standard_ExtString Value, Standard_OStream& s) -{ - s << hex << Value << " Standard_ExtString " << endl; -} - -const Handle_Standard_Type& Standard_ExtString_Type_() -{ - static Handle_Standard_Type _aType = - new Standard_Type("Standard_ExtString",sizeof(Standard_ExtString),0,NULL); - - return _aType; -} Standard_Integer HashCode (const Standard_ExtString Value, const Standard_Integer Upper) diff --git a/src/Standard/Standard_ExtString.hxx b/src/Standard/Standard_ExtString.hxx index f808fc3305..2b8715d555 100644 --- a/src/Standard/Standard_ExtString.hxx +++ b/src/Standard/Standard_ExtString.hxx @@ -24,19 +24,6 @@ #include -class Handle_Standard_Type; - -__Standard_API const Handle_Standard_Type& Standard_ExtString_Type_(); -//class Standard_OStream; -//void ShallowDump (const Standard_ExtString, Standard_OStream& ); -//============================================================================ -//==== ShallowCopy: Returns a CString -//============================================================================ -inline Standard_ExtString ShallowCopy (const Standard_ExtString Value) -{ - return Value; -} - //============================================================================ //==== HashCode : Returns a HashCode ExtString //============================================================================ diff --git a/src/Standard/Standard_GUID.cdl b/src/Standard/Standard_GUID.cdl index 6bcca2cdc6..6a15a597ba 100644 --- a/src/Standard/Standard_GUID.cdl +++ b/src/Standard/Standard_GUID.cdl @@ -85,7 +85,7 @@ is Assign(me : out; uid : UUID from Standard); ---C++: alias operator = - ShallowDump(me; aStream : in out OStream from Standard) is redefined; + ShallowDump(me; aStream : in out OStream from Standard); ---Purpose: Display the GUID with the following format: -- -- "00000000-0000-0000-0000-000000000000" diff --git a/src/Standard/Standard_IStream.cxx b/src/Standard/Standard_IStream.cxx deleted file mode 100644 index 505ea3dfa5..0000000000 --- a/src/Standard/Standard_IStream.cxx +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include -#include - -const Handle_Standard_Type& Standard_IStream_Type_() -{ - static Handle_Standard_Type _aType = - new Standard_Type("Standard_IStream", sizeof(Standard_IStream)); - - return _aType; -} - diff --git a/src/Standard/Standard_IStream.hxx b/src/Standard/Standard_IStream.hxx index a87b03fe38..da43649b4d 100644 --- a/src/Standard/Standard_IStream.hxx +++ b/src/Standard/Standard_IStream.hxx @@ -18,10 +18,6 @@ #include #include -class Handle_Standard_Type; - -__Standard_API const Handle_Standard_Type& Standard_IStream_Type_(); - -#define Standard_IStream istream +typedef std::istream Standard_IStream; #endif diff --git a/src/Standard/Standard_Integer.cxx b/src/Standard/Standard_Integer.cxx deleted file mode 100644 index 653e31b9ec..0000000000 --- a/src/Standard/Standard_Integer.cxx +++ /dev/null @@ -1,227 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include -#include -#include -#include -#include -#include - -// ------------------------------------------------------------------ -// CharToInt : Converts a character in an integer value -// ------------------------------------------------------------------ -const Handle_Standard_Type& Standard_Integer_Type_() -{ - static Handle_Standard_Type _aType = new - Standard_Type("Standard_Integer",sizeof(Standard_Integer),0,NULL); - - return _aType; -} - -Standard_Integer CharToInt(const Standard_Character me) -{ - if (!IsDigit(me)) { - Standard_ConstructionError::Raise(); - } - - Standard_Character S[2]; - S[0] = me; - S[1] = 0; - return atoi(S); -} - -// ------------------------------------------------------------------ -// CharToInt : Converts a string in an integer value -// ------------------------------------------------------------------ - -Standard_Integer CharToInt(const Standard_CString me) -{ - const Standard_Size Len = strlen(me); - for (Standard_Size I = 0; I < Len; I++) - if (!IsDigit(me[I])) { - Standard_ConstructionError::Raise(); - } - return atoi(me); -} - -// ------------------------------------------------------------------ -// ShallowCopy : Copy of an integer -// ------------------------------------------------------------------ - -Standard_Integer ShallowCopy (const Standard_Integer me) -{ return me; } - -// ------------------------------------------------------------------ -// ShallowDump : Writes an integer value -// ------------------------------------------------------------------ -Standard_EXPORT void ShallowDump (const Standard_Integer Value, Standard_OStream& s) -{ s << Value << " Standard_Integer" << "\n"; } - -// ------------------------------------------------------------------ -// NextPrime : Compute the first prime number greater or equal than an integer -// ------------------------------------------------------------------ - -#define VALUESNBR 4 - -long NextPrime (const long me ) -{ - - struct svalue {int signiaib ; - int nbr ;} ; - - struct svalue values[VALUESNBR] ; - long ia ; - long maxia ; - long ib[4] ; - int n[4] ; -// int signiaib[4] = { -1 , +1 , +1 , -1 } ; - int signiaib[4]; - signiaib[0] = -1; - signiaib[1] = 1; - signiaib[2] = 1; - signiaib[3] = -1; - long remain ; - - int nbvalues ; - int loop ; - int nindd ; - long minn ; - long maxvn ; - long premret = 0 ; - - if (me < 0 || me > -#if defined (__alpha) || defined(DECOSF1) - 127149130704178201 -#else - 2147483647 -#endif - ){ - Standard_RangeError:: - Raise("Try to apply NextPrime method with negative, null or too large value."); - } - - if ( me <= 7 ) { - if ( me <= 1 ) - return 1 ; - else if ( me <= 2 ) - return 2 ; - else if ( me <= 3 ) - return 3 ; - else if ( me <= 5 ) - return 5 ; - else if ( me <= 7 ) - return 7 ; - } - - minn = ( me - 1 ) / 6 ; // n minimum - while ( 6*minn+1 < me ) { - minn += 1 ; - } - - maxia = long( sqrt((double ) me ) / 6 + 1 ) ; - - maxvn = minn + VALUESNBR ; - - nbvalues = 0 ; - for ( nindd = 0 ; nindd < VALUESNBR ; nindd++ ) { - if ( 6*(nindd+minn)-1 < me ) { - values[nindd].nbr = 1 ; - values[nindd].signiaib = -1 ; - nbvalues += 1 ; - } - else { - values[nindd].nbr = 0 ; - values[nindd].signiaib = 0 ; - } - } - - for ( ia = 1 ; ia <= maxia ; ia++ ) { - if ( nbvalues == VALUESNBR*2 ) { - break ; - } - remain = -VALUESNBR ; - ib[0] = ( minn + ia - remain ) / (6*ia - 1) ; - n[0] = int ( 6*ia*ib[0] - ia - ib[0] - minn ) ; - ib[1] = ( minn - ia - remain ) / (6*ia - 1) ; - n[1] = int ( 6*ia*ib[1] + ia - ib[1] - minn ) ; - ib[2] = ( minn + ia - remain ) / (6*ia + 1) ; - n[2] = int ( 6*ia*ib[2] - ia + ib[2] - minn ) ; - ib[3] = ( minn - ia - remain ) / (6*ia + 1) ; - n[3] = int ( 6*ia*ib[3] + ia + ib[3] - minn ) ; - for ( loop = 0 ; loop < 4 ; loop++ ) { - if ( n[loop] >= 0 && n[loop] < VALUESNBR ) { - if ( ( values[n[loop]].nbr == 0 ) || - ( values[n[loop]].signiaib == signiaib[loop] ) ) { - values[n[loop]].signiaib = -signiaib[loop] ; - values[n[loop]].nbr += 1 ; - if ( values[n[loop]].nbr <= 2 ) - nbvalues += 1 ; - } - } - } - } - for ( nindd = 0 ; nindd < VALUESNBR ; nindd++ ) { - if ( values[nindd].nbr == 0 ) { - if ( me <= 6*(nindd+minn)-1 ) { - premret = 6*(nindd+minn)-1 ; - break ; - } - else if ( me <= 6*(nindd+minn)+1 ) { - premret = 6*(nindd+minn)+1 ; - break ; - } - } - else if ( values[nindd].nbr == 1 ) { - if ( values[nindd].signiaib > 0 ) { - if ( me <= 6*(nindd+minn)-1 ) { - premret = 6*(nindd+minn)-1 ; - break ; - } - } - else { - if ( me <= 6*(nindd+minn)+1 ) { - premret = 6*(nindd+minn)+1 ; - break ; - } - } - } - } - - if ( premret != 0 ) { - return premret ; - } - - return NextPrime ( 6*(maxvn-1)+2) ; - -} -static const Standard_Integer Primes[] = { - 101, 1009, 2003, 3001, 4001, 5003, 6007, 7001, 8009, 9001, - 10007, 12007, 14009, 16007, 18013, - 20011, 23003, 26003, 29009, - 33013, 37003, - 41011, 46021, - 51001, 57037, - 65003, - 100019}; // catch the biggest - -const Standard_Integer NbPrimes = 26; // does not include the biggest - -Standard_Integer NextPrimeForMap(const Standard_Integer N) -{ - Standard_Integer i; - for (i = 0; i < NbPrimes; i++) - if (Primes[i] > N) break; - return Primes[i]; -} diff --git a/src/Standard/Standard_Integer.hxx b/src/Standard/Standard_Integer.hxx index e0f5df1f2e..2207840523 100755 --- a/src/Standard/Standard_Integer.hxx +++ b/src/Standard/Standard_Integer.hxx @@ -16,28 +16,7 @@ #define _Standard_Integer_HeaderFile #include -# include - -class Handle_Standard_Type; - -__Standard_API const Handle_Standard_Type& Standard_Integer_Type_(); -// =============================================== -// Methods from Standard_Entity class which are redefined: -// - Hascode -// - IsEqual -// - IsSimilar -// - Shallowcopy -// - ShallowDump -// =============================================== - -// ================================== -// Methods implemeted in Standard_Integer.cxx -// ================================== -__Standard_API Standard_Integer NextPrimeForMap(const Standard_Integer anInt ) ; -__Standard_API long NextPrime (const long me); -__Standard_API Standard_Integer CharToInt (const Standard_Character me); -__Standard_API Standard_Integer CharToInt (const Standard_CString me); -__Standard_API Standard_Integer ShallowCopy (const Standard_Integer me); +#include // =============== // Inline methods diff --git a/src/Standard/Standard_OId.hxx b/src/Standard/Standard_OId.hxx deleted file mode 100644 index 8efc44dd4a..0000000000 --- a/src/Standard/Standard_OId.hxx +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Standard_OId_HeaderFile -#define _Standard_OId_HeaderFile - -#include -#include - -class Standard_Persistent; -typedef Standard_Persistent* Standard_OId; - -extern Standard_OId ShallowCopy (const Standard_OId me) ; -extern Standard_Integer HashCode(const Standard_OId me, - const Standard_Integer Upper); -//extern void ShallowDump (const Standard_OId Value, Standard_OStream& s); - -const Handle_Standard_Type& Standard_OId_Type_(); - -#endif diff --git a/src/Standard/Standard_OStream.cxx b/src/Standard/Standard_OStream.cxx deleted file mode 100644 index 05a7f32bfc..0000000000 --- a/src/Standard/Standard_OStream.cxx +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include -#include - -const Handle_Standard_Type& Standard_OStream_Type_() -{ - static Handle_Standard_Type _aType = - new Standard_Type("Standard_OStream", sizeof(Standard_OStream)); - - return _aType; -} - - diff --git a/src/Standard/Standard_OStream.hxx b/src/Standard/Standard_OStream.hxx index 056d81cbbf..c6ef90942b 100644 --- a/src/Standard/Standard_OStream.hxx +++ b/src/Standard/Standard_OStream.hxx @@ -18,24 +18,7 @@ #include #include -class Handle_Standard_Type; - -__Standard_API const Handle_Standard_Type& Standard_OStream_Type_(); - -typedef ostream Standard_OStream; - -__Standard_API void ShallowDump(const Standard_Boolean, Standard_OStream& ); -__Standard_API void ShallowDump(const Standard_CString, Standard_OStream& ); -__Standard_API void ShallowDump(const Standard_Character, Standard_OStream& ); -__Standard_API void ShallowDump(const Standard_ExtCharacter, Standard_OStream& ); -__Standard_API void ShallowDump(const Standard_ExtString, Standard_OStream& ); -__Standard_API void ShallowDump(const Standard_Integer, Standard_OStream& ); -__Standard_API void ShallowDump(const Standard_Real, Standard_OStream& ); -__Standard_API void ShallowDump(const Standard_ShortReal, Standard_OStream& ); -class Handle(Standard_Transient); -__Standard_API void ShallowDump(const Handle(Standard_Transient)&, Standard_OStream& ); -class Handle(Standard_Persistent); -__Standard_API void ShallowDump(const Handle(Standard_Persistent)&, Standard_OStream& ); +typedef std::ostream Standard_OStream; #endif diff --git a/src/Standard/Standard_Persistent.cdl b/src/Standard/Standard_Persistent.cdl index 5a9ccf2d89..a146003c59 100644 --- a/src/Standard/Standard_Persistent.cdl +++ b/src/Standard/Standard_Persistent.cdl @@ -59,13 +59,6 @@ uses is - ShallowCopy (me) returns mutable like me is deferred; - ---Purpose: Returns a copy at the first level of . - -- The objects referenced are not copied. - -- Entities copied by ShallowCopy are equal. - ---C++: function call - ---Level: Advanced - Delete (me: mutable) is redefined; ---Purpose: Deletes this object. diff --git a/src/Standard/Standard_Persistent.cxx b/src/Standard/Standard_Persistent.cxx index 2006e338c7..0fb2fde648 100644 --- a/src/Standard/Standard_Persistent.cxx +++ b/src/Standard/Standard_Persistent.cxx @@ -49,33 +49,12 @@ Handle_Standard_Persistent Standard_Persistent::This() const return aHand; } -// The Method ShallowCopy -// -Handle_Standard_Persistent Standard_Persistent::ShallowCopy() const -{ - //the method must be redefined in the every subclass that is expected to use it - Standard_NotImplemented::Raise ("The ShallowCopy() method must be redefined in the subclass"); - return This(); // for compilation only -} - -// Empty Constructor -// -// Standard_Persistent::Standard_Persistent() -// { -// } - // Empty Destructor // Standard_Persistent::~Standard_Persistent() { } -// Constructor from a Standard_Persistent -// -// Standard_Persistent::Standard_Persistent(const Standard_Persistent& ) -// { -// } - // Operator= with a Standard_Persistent // Standard_Persistent& Standard_Persistent::operator=(const Standard_Persistent& ) @@ -106,13 +85,6 @@ Standard_Boolean Standard_Persistent::IsKind (const Handle(Standard_Type)& aType // return (aType == STANDARD_TYPE(Standard_Persistent)); } -void Standard_Persistent::ShallowDump(Standard_OStream& AStream) const -{ - Handle(Standard_Persistent) me = this; - ::ShallowDump(me, AStream); -} - - void Standard_Persistent::Delete() const { delete((Standard_Persistent *)this); diff --git a/src/Standard/Standard_Persistent_proto.hxx b/src/Standard/Standard_Persistent_proto.hxx index c9a510845f..a73b70fa18 100644 --- a/src/Standard/Standard_Persistent_proto.hxx +++ b/src/Standard/Standard_Persistent_proto.hxx @@ -21,6 +21,7 @@ class Standard_Type; class Handle_Standard_Type; +class Handle_Standard_Persistent; class Standard_Type; class Storage_stCONSTclCOM; @@ -40,7 +41,6 @@ public: DEFINE_STANDARD_ALLOC Standard_EXPORT virtual Handle_Standard_Persistent This() const; - Standard_EXPORT virtual Handle_Standard_Persistent ShallowCopy () const; Standard_EXPORT virtual void Delete() const; Standard_EXPORT virtual ~Standard_Persistent(); @@ -52,7 +52,6 @@ public: Standard_EXPORT virtual const Handle_Standard_Type& DynamicType() const; Standard_EXPORT Standard_Boolean IsKind(const Handle_Standard_Type&)const; Standard_EXPORT Standard_Boolean IsInstance(const Handle_Standard_Type&)const; - Standard_EXPORT virtual void ShallowDump(Standard_OStream& ) const; }; #include diff --git a/src/Standard/Standard_PrimitiveTypes.hxx b/src/Standard/Standard_PrimitiveTypes.hxx index 6e935f6369..ab186f42b5 100644 --- a/src/Standard/Standard_PrimitiveTypes.hxx +++ b/src/Standard/Standard_PrimitiveTypes.hxx @@ -36,9 +36,6 @@ class Standard_Transient; #include #include -__Standard_API Standard_Address ShallowCopy(const Standard_Address, - const Handle_Standard_Type& ); - __Standard_API Standard_Integer HashCode(const Standard_Address, const Standard_Integer, const Handle_Standard_Type&); diff --git a/src/Standard/Standard_Real.cxx b/src/Standard/Standard_Real.cxx index 0993656635..b78a45dff1 100644 --- a/src/Standard/Standard_Real.cxx +++ b/src/Standard/Standard_Real.cxx @@ -20,14 +20,6 @@ #include #include -const Handle_Standard_Type& Standard_Real_Type_() -{ - static Handle_Standard_Type _aType = - new Standard_Type("Standard_Real",sizeof(Standard_Real),0,NULL); - - return _aType; -} - // ------------------------------------------------------------------ // Hascode : Computes a hascoding value for a given real // ------------------------------------------------------------------ @@ -47,14 +39,6 @@ Standard_Integer HashCode(const Standard_Real me, const Standard_Integer Upper) return HashCode( ( U.I[0] ^ U.I[1] ) , Upper ) ; } -// ------------------------------------------------------------------ -// ShallowCopy : Makes a copy of a real value -// ------------------------------------------------------------------ -Standard_Real ShallowCopy (const Standard_Real me) -{ - return me; -} - //------------------------------------------------------------------- // ACos : Returns the value of the arc cosine of a real //------------------------------------------------------------------- @@ -245,14 +229,6 @@ double NextAfter(const double x, const double y) return res.real; } -// ------------------------------------------------------------------ -// ShallowDump : Writes a real value -// ------------------------------------------------------------------ -Standard_EXPORT void ShallowDump(const Standard_Real Value, - Standard_OStream& s) -{ s << Value << " Standard_Real" << "\n"; } - - //------------------------------------------------------------------- // ATanh : Returns the value of the hyperbolic arc tangent of a real //------------------------------------------------------------------- diff --git a/src/Standard/Standard_Real.hxx b/src/Standard/Standard_Real.hxx index 735f5344e8..14f425b9c4 100644 --- a/src/Standard/Standard_Real.hxx +++ b/src/Standard/Standard_Real.hxx @@ -21,17 +21,11 @@ #include #include -class Handle_Standard_Type; - -__Standard_API const Handle_Standard_Type& Standard_Real_Type_(); - // =============================================== // Methods from Standard_Entity class which are redefined: // - Hascode // - IsEqual // - IsSimilar -// - Shallowcopy -// - ShallowDump // =============================================== // ================================== @@ -39,7 +33,6 @@ __Standard_API const Handle_Standard_Type& Standard_Real_Type_(); // ================================== //.... Herited from Standard_Storable __Standard_API Standard_Integer HashCode (const Standard_Real, const Standard_Integer); -__Standard_API Standard_Real ShallowCopy (const Standard_Real ); __Standard_API Standard_Real ACos (const Standard_Real ); __Standard_API Standard_Real ACosApprox (const Standard_Real ); @@ -52,9 +45,6 @@ __Standard_API Standard_Real ACosh (const Standard_Real ); __Standard_API Standard_Real Log (const Standard_Real ); __Standard_API Standard_Real Sqrt (const Standard_Real ); -//class Standard_OStream; -//void ShallowDump(const Standard_Real, Standard_OStream& ); - //------------------------------------------------------------------- // RealSmall : Returns the smallest positive real //------------------------------------------------------------------- diff --git a/src/Standard/Standard_ShallowDump.cxx b/src/Standard/Standard_ShallowDump.cxx deleted file mode 100644 index fe9a6c5205..0000000000 --- a/src/Standard/Standard_ShallowDump.cxx +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include -#include - -#include -#include - -// now with these two proto, we don't need the include of Standard_Persistent -class Handle(Standard_Persistent); -const Handle_Standard_Type &Standard_Persistent_Type_(); - -//============================================================================ -void ShallowDump(const Handle(Standard_Persistent)& me, Standard_OStream &aOut) -{ - Handle(Standard_Type) aType = me->DynamicType(); - - aOut << "class " << aType->Name() << endl; -} - -//============================================================================ -void ShallowDump(const Handle(Standard_Transient)& me, Standard_OStream &aOut) -{ - Handle(Standard_Type) aType = me->DynamicType(); - - aOut << "class " << aType->Name() << endl; -} - diff --git a/src/Standard/Standard_ShortReal.cxx b/src/Standard/Standard_ShortReal.cxx index f626628852..cc2d24146e 100644 --- a/src/Standard/Standard_ShortReal.cxx +++ b/src/Standard/Standard_ShortReal.cxx @@ -18,15 +18,6 @@ #include #include -const Handle_Standard_Type& Standard_ShortReal_Type_() -{ - static Handle_Standard_Type _aType = - new Standard_Type("Standard_ShortReal",sizeof(Standard_ShortReal),0,NULL); - - return _aType; -} - - // ------------------------------------------------------------------ // Hascode : Computes a hascoding value for a given ShortReal // ------------------------------------------------------------------ @@ -43,20 +34,4 @@ Standard_Integer HashCode(const Standard_ShortReal me, const Standard_Integer Up } U; U.R = me; return HashCode( U.I , Upper) ; - } - -// ------------------------------------------------------------------ -// ShallowCopy : Makes a copy of a ShortReal value -// ------------------------------------------------------------------ -Standard_ShortReal ShallowCopy (const Standard_ShortReal me) -{ - return me; } - - -// ------------------------------------------------------------------ -// ShallowDump : Writes a ShortReal value -// ------------------------------------------------------------------ -Standard_EXPORT void ShallowDump(const Standard_ShortReal Value, - Standard_OStream& s) -{ s << Value << " Standard_ShortReal" << "\n"; } diff --git a/src/Standard/Standard_ShortReal.hxx b/src/Standard/Standard_ShortReal.hxx index 891f3af36f..6549839262 100644 --- a/src/Standard/Standard_ShortReal.hxx +++ b/src/Standard/Standard_ShortReal.hxx @@ -23,10 +23,6 @@ class Handle_Standard_Type; -__Standard_API const Handle_Standard_Type& Standard_ShortReal_Type_(); -//class Standard_OStream; -//void ShallowDump (const Standard_ShortReal, Standard_OStream& ); - // *********************************** // // Class methods // // // @@ -140,8 +136,6 @@ inline Standard_ShortReal Min (const Standard_ShortReal Val1, // - Hascode // - IsEqual // - IsSimilar -// - Shallowcopy -// - ShallowDump // =============================================== // ================================== @@ -149,7 +143,6 @@ inline Standard_ShortReal Min (const Standard_ShortReal Val1, // ================================== //.... Herited from Standard_Storable __Standard_API Standard_Integer HashCode (const Standard_ShortReal, const Standard_Integer); -__Standard_API Standard_ShortReal ShallowCopy (const Standard_ShortReal ); //------------------------------------------------------------------- // IsEqual : Returns Standard_True if two ShortReals are equal diff --git a/src/Standard/Standard_Storable.cdl b/src/Standard/Standard_Storable.cdl index 82fd475992..6210692945 100644 --- a/src/Standard/Standard_Storable.cdl +++ b/src/Standard/Standard_Storable.cdl @@ -49,13 +49,5 @@ is ---C++: function call ---Level: Public - ShallowDump (me; S: in out OStream) is virtual; - ---Purpose: Prints the contents at the first level of on - -- the stream . The Root version of ShallowDump prints - -- the name of the class is instance of, followed by - -- its memory address. - ---C++: function call - ---Level: Public - end Storable; diff --git a/src/Standard/Standard_Storable.cxx b/src/Standard/Standard_Storable.cxx index 96af84ca0f..0c34cdfb1b 100644 --- a/src/Standard/Standard_Storable.cxx +++ b/src/Standard/Standard_Storable.cxx @@ -34,10 +34,3 @@ Standard_Boolean Standard_Storable::IsSimilar(const Standard_Storable& ) const { return Standard_True; } - -//======================================================================== -void Standard_Storable::ShallowDump(Standard_OStream& ) const -{ -// ::ShallowDump((Standard_Address) this, STANDARD_TYPE(Standard_Storable), S); -} - diff --git a/src/Standard/Standard_Time.cxx b/src/Standard/Standard_Time.cxx deleted file mode 100755 index 1018ec1828..0000000000 --- a/src/Standard/Standard_Time.cxx +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) 2013-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include -#include - -const Handle_Standard_Type& Standard_Time_Type_() -{ - static Handle_Standard_Type _aType = - new Standard_Type ("Standard_Time", sizeof(Standard_Time), 0, NULL); - - return _aType; -} diff --git a/src/Standard/Standard_Time.hxx b/src/Standard/Standard_Time.hxx index 2580189450..235f2bfd38 100755 --- a/src/Standard/Standard_Time.hxx +++ b/src/Standard/Standard_Time.hxx @@ -16,10 +16,6 @@ #include -class Handle_Standard_Type; - -__Standard_API const Handle_Standard_Type& Standard_Time_Type_(); - // =============================================== // Methods from Standard_Entity class which are redefined: // - IsEqual diff --git a/src/Standard/Standard_Transient.cxx b/src/Standard/Standard_Transient.cxx index fb2e40261e..ff7d191b31 100644 --- a/src/Standard/Standard_Transient.cxx +++ b/src/Standard/Standard_Transient.cxx @@ -67,12 +67,6 @@ Standard_Boolean Standard_Transient::IsKind (const Standard_CString theTypeName) return DynamicType()->SubType ( theTypeName ); } -void Standard_Transient::ShallowDump(Standard_OStream& theStream) const -{ - theStream << "class " << DynamicType()->Name() << " at " << this << endl; -} - - void Standard_Transient::Delete() const { delete((Standard_Transient *)this); diff --git a/src/Standard/Standard_Transient_proto.hxx b/src/Standard/Standard_Transient_proto.hxx index 765386fdaf..fcd8a7b6e9 100644 --- a/src/Standard/Standard_Transient_proto.hxx +++ b/src/Standard/Standard_Transient_proto.hxx @@ -50,8 +50,6 @@ class Standard_Transient //! Memory deallocator for transient classes Standard_EXPORT virtual void Delete() const; - Standard_EXPORT virtual void ShallowDump(Standard_OStream& ) const; - //! Returns a type information object about this object. Standard_EXPORT virtual const Handle_Standard_Type& DynamicType() const; diff --git a/src/Standard/Standard_Type.cdl b/src/Standard/Standard_Type.cdl index dd3d097648..fbef45f9d3 100644 --- a/src/Standard/Standard_Type.cdl +++ b/src/Standard/Standard_Type.cdl @@ -165,18 +165,6 @@ is -- AncestorIterator. ---Level: Advanced - ShallowDump (me); - ---Purpose: - -- Prints the Information about type. - ---C++: function call - ---Level: Advanced - - ShallowDump (me; S: in out OStream); - ---Purpose: - -- Prints the Information about type. - ---C++: function call - ---Level: Advanced - Print (me; s: in out OStream); ---Purpose: -- Prints on the stream the name of Type. diff --git a/src/Standard/Standard_Type.cxx b/src/Standard/Standard_Type.cxx index b7bf249f92..320b8aa2bc 100644 --- a/src/Standard/Standard_Type.cxx +++ b/src/Standard/Standard_Type.cxx @@ -188,73 +188,6 @@ Standard_Boolean Standard_Type::SubType(const Standard_CString theName)const return Standard_False; } -//============================================================================ -void Standard_Type::ShallowDump() const -{ - ShallowDump(cout) ; -} - -//============================================================================ -void Standard_Type::ShallowDump(Standard_OStream& AStream) const -{ - Standard_Integer i; - Handle(Standard_Type) aType; - - Handle(Standard_Type) *allAncestors; - -// AStream << "Standard_Type " << hex << (Standard_Address )this << dec << " " ; - - allAncestors = (Handle(Standard_Type) *)myAncestors; - - if(myKind == Standard_IsEnumeration) { - AStream << "enumeration " << myName << endl; - } - - if(myKind == Standard_IsPrimitive) { - AStream << "primitive " << myName << endl; - } - - if(myKind == Standard_IsImported) { - AStream << "imported " << myName << endl; - } - - if(myKind == Standard_IsClass) { - AStream << "class " << myName << endl; - if(SubType(STANDARD_TYPE(Standard_Transient))) { - AStream << " -- manipulated by 'Handle'" << endl; - } - else if(SubType(STANDARD_TYPE(Standard_Persistent))) { - AStream << " -- manipulated by 'Handle' and is 'persistent'"<< endl; - } - } - - if(myNumberOfParent > 0) { - AStream << " inherits "; - for(i=0; i1) AStream <<", "; - if ( !aType.IsNull() ) - AStream << aType->Name(); - else - AStream << " ??? (TypeIsNull)" ; - } - AStream << endl; - } - - if(myNumberOfAncestor > myNumberOfParent) { - AStream << " -- Ancestors: "; - for(i=myNumberOfParent; i1) AStream <<", "; - if ( !aType.IsNull() ) - AStream << aType->Name(); - else - AStream << " ??? (TypeIsNull)" ; - } - AStream << endl; - } -} - // ------------------------------------------------------------------ // Print (me; s: in out OStream) returns OStream; // ------------------------------------------------------------------ diff --git a/src/Standard/Standard_UUID.cxx b/src/Standard/Standard_UUID.cxx index 9d346d52f7..8e6a12cd14 100644 --- a/src/Standard/Standard_UUID.cxx +++ b/src/Standard/Standard_UUID.cxx @@ -15,12 +15,6 @@ #include #include -const Handle(Standard_Type) & TYPE(Standard_UUID) -{ static Handle(Standard_Type) _aType= - new Standard_Type("Standard_UUID", sizeof(Standard_UUID)); - return _aType; -} - //void Standard_GUID::Assign(const Standard_UUID& uid) void Standard_GUID::Assign(const Standard_UUID& ) { diff --git a/src/Standard/Standard_UUID.hxx b/src/Standard/Standard_UUID.hxx index bac4d8e7be..6d2eb593fd 100644 --- a/src/Standard/Standard_UUID.hxx +++ b/src/Standard/Standard_UUID.hxx @@ -30,9 +30,6 @@ typedef struct { typedef GUID Standard_UUID ; -class Handle_Standard_Type; -const Handle(Standard_Type) & TYPE(Standard_UUID); - #endif diff --git a/src/Storage/FILES b/src/Storage/FILES index 06fd000065..cda112b25b 100755 --- a/src/Storage/FILES +++ b/src/Storage/FILES @@ -2,4 +2,3 @@ Storage_Macros.hxx Storage_BucketOfPersistent.hxx Storage_Position.hxx Storage_Container.hxx -Storage_Container.cxx diff --git a/src/Storage/Storage_Container.cxx b/src/Storage/Storage_Container.cxx deleted file mode 100644 index 8a3480472d..0000000000 --- a/src/Storage/Storage_Container.cxx +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#include -#include - -const Handle_Standard_Type& Storage_Container_Type_() -{ - static Handle_Standard_Type _aType = new Standard_Type("Storage_Container",sizeof(Storage_Container)); - - return _aType; -} diff --git a/src/Storage/Storage_Container.hxx b/src/Storage/Storage_Container.hxx index 2f48897d65..eaec1a40f2 100644 --- a/src/Storage/Storage_Container.hxx +++ b/src/Storage/Storage_Container.hxx @@ -14,8 +14,6 @@ #ifndef _Storage_Container_HeaderFile #define _Storage_Container_HeaderFile -class Handle_Standard_Type; -const Handle_Standard_Type& Storage_Container_Type_(); class Storage_BaseDriver; typedef Storage_BaseDriver* Storage_Container; diff --git a/src/Storage/Storage_Macros.hxx b/src/Storage/Storage_Macros.hxx index 64d2c0afb8..ee29705540 100644 --- a/src/Storage/Storage_Macros.hxx +++ b/src/Storage/Storage_Macros.hxx @@ -68,7 +68,7 @@ Standard_EXPORT Handle(Storage_CallBack) CallBackSelection(const TCollection_As return cback; \ } -#define Storage_ADD_TYPES(schema,classe,callback) if (t == classe##_Type_()) { \ +#define Storage_ADD_TYPES(schema,classe,callback) if (t == STANDARD_TYPE(classe)) { \ cback = new callback ; \ BindType(theTypeName,cback); \ cback->Add(p,this); \ diff --git a/src/TCollection/TCollection_HAsciiString.cdl b/src/TCollection/TCollection_HAsciiString.cdl index 9b4de998b0..c9cec7fc5f 100644 --- a/src/TCollection/TCollection_HAsciiString.cdl +++ b/src/TCollection/TCollection_HAsciiString.cdl @@ -571,14 +571,6 @@ is ---Level: Advanced ---Purpose: Returns the field myString. - ShallowCopy(me) returns mutable like me; - ---Level: Advanced - ---C++: function call - - ShallowDump(me ; s: in out OStream); - ---Level: Avanced - ---C++: function call - IsSameState (me ; other : like me) ---Level: Advanced returns Boolean; diff --git a/src/TCollection/TCollection_HAsciiString.cxx b/src/TCollection/TCollection_HAsciiString.cxx index af4b81b98b..125f1f1e0d 100644 --- a/src/TCollection/TCollection_HAsciiString.cxx +++ b/src/TCollection/TCollection_HAsciiString.cxx @@ -568,27 +568,6 @@ Standard_Character TCollection_HAsciiString::Value(const Standard_Integer where) return myString.Value(where); } -// ---------------------------------------------------------------------------- -// ShallowCopy -// ---------------------------------------------------------------------------- -Handle(TCollection_HAsciiString) TCollection_HAsciiString::ShallowCopy() const -{ -// Handle(TCollection_HAsciiString) thecopy = new TCollection_HAsciiString; -// for (Standard_Integer i = 1 ; i <= Length() ; i++) -// thecopy->Insert(i,Value(i)); -// return thecopy; - return new TCollection_HAsciiString(*this); -} - -//--------------------------------------------------------------------- -// ShallowDump -//--------------------------------------------------------------------- -void TCollection_HAsciiString::ShallowDump(Standard_OStream& S) const -{ - S << "begin class HAsciiString "< . - ShallowCopy(me) returns mutable like me; - ---C++: function call - - ShallowDump(me ; s: in out OStream); - ---Level: Advanced - IsSameState (me ; other : like me) returns Boolean; ---Level: Advanced diff --git a/src/TCollection/TCollection_HExtendedString.cxx b/src/TCollection/TCollection_HExtendedString.cxx index d1541a1cf6..fc4aa5f5d8 100644 --- a/src/TCollection/TCollection_HExtendedString.cxx +++ b/src/TCollection/TCollection_HExtendedString.cxx @@ -290,27 +290,6 @@ void TCollection_HExtendedString::Print(Standard_OStream& S) const myString.Print(S); } -// ---------------------------------------------------------------------------- -// ShallowCopy -// ---------------------------------------------------------------------------- -Handle(TCollection_HExtendedString) TCollection_HExtendedString::ShallowCopy() const -{ - Handle(TCollection_HExtendedString) thecopy = - new TCollection_HExtendedString; - for (Standard_Integer i = 1 ; i <= Length() ; i++) - thecopy->Insert(i,Value(i)); - return thecopy; -} - -//--------------------------------------------------------------------- -// ShallowDump -//--------------------------------------------------------------------- -void TCollection_HExtendedString::ShallowDump(Standard_OStream& S) const -{ - S << "begin class HExtendedString "<Append(mySequence(i)); - return TheCopy; -} - // ---------------------------------------------------------------------------- // IsSamestate // ---------------------------------------------------------------------------- diff --git a/src/TCollection/TCollection_HSet.cdl b/src/TCollection/TCollection_HSet.cdl index d5cc3dae72..bddc174e7e 100644 --- a/src/TCollection/TCollection_HSet.cdl +++ b/src/TCollection/TCollection_HSet.cdl @@ -134,15 +134,6 @@ is -- The two sets cannot be identical. ---C++: inline is static; - - ShallowCopy(me) returns mutable like me; - ---Level: Advanced - ---C++: function call - - -- IsSameState (me; other: like me) returns Boolean; - -- Level: Advanced - - Set(me) returns TheSet ---Level: Advanced diff --git a/src/TCollection/TCollection_HSet.gxx b/src/TCollection/TCollection_HSet.gxx index 5a0dfe0c3a..df2ab513ef 100644 --- a/src/TCollection/TCollection_HSet.gxx +++ b/src/TCollection/TCollection_HSet.gxx @@ -65,18 +65,6 @@ Handle(TCollection_HSet) TCollection_HSet::Difference return R; } -//======================================================================= -//function : ShallowCopy -//purpose : -//======================================================================= - -Handle(TCollection_HSet) TCollection_HSet::ShallowCopy() const -{ - Handle(TCollection_HSet) S = new TCollection_HSet(); - S->ChangeSet() = mySet; - return S; -} - //======================================================================= //function : IsSameState //purpose : diff --git a/src/TDF/TDF_Attribute.cxx b/src/TDF/TDF_Attribute.cxx index b5353d6340..53275b6ed3 100644 --- a/src/TDF/TDF_Attribute.cxx +++ b/src/TDF/TDF_Attribute.cxx @@ -386,8 +386,8 @@ Standard_OStream& TDF_Attribute::Dump(Standard_OStream& anOS) const Standard_PCharacter pStr; // pStr=toto; - ID().ToCString(pStr); anOS<<";\tID = "<First returns the first - // PickPath found in the sequence. - Result = MyPickPathSequence->Sequence().First (); - break; - - case Visual3d_TOO_BOTTOMFIRST : - // MyPickPathSequence->Last returns the last - // PickPath found in the sequence. - Result = MyPickPathSequence->Sequence().Last (); - break; - - } - return (Result.StructIdentifier ()); -} - -Standard_Integer Visual3d_PickDescriptor::TopPickId () const { - -Visual3d_PickPath Result; - - if (MyPickPathSequence->IsEmpty ()) - Visual3d_PickError::Raise ("PickDescriptor empty"); - - switch (MyContext.Order ()) { - - case Visual3d_TOO_TOPFIRST : - // MyPickPathSequence->First returns the first - // PickPath found in the sequence. - Result = MyPickPathSequence->Sequence().First (); - break; - - case Visual3d_TOO_BOTTOMFIRST : - // MyPickPathSequence->Last returns the last - // PickPath found in the sequence. - Result = MyPickPathSequence->Sequence().Last (); - break; - - } - return (Result.PickIdentifier ()); -} - -Standard_Integer Visual3d_PickDescriptor::TopElementNumber () const { - -Visual3d_PickPath Result; - - if (MyPickPathSequence->IsEmpty ()) - Visual3d_PickError::Raise ("PickDescriptor empty"); - - switch (MyContext.Order ()) { - - case Visual3d_TOO_TOPFIRST : - // MyPickPathSequence->First returns the first - // PickPath found in the sequence. - Result = MyPickPathSequence->Sequence().First (); - break; - - case Visual3d_TOO_BOTTOMFIRST : - // MyPickPathSequence->Last returns the last - // PickPath found in the sequence. - Result = MyPickPathSequence->Sequence().Last (); - break; - - } - return (Result.ElementNumber ()); -} - -Handle(Visual3d_HSequenceOfPickPath) Visual3d_PickDescriptor::PickPath () const { - - return (Handle(Visual3d_HSequenceOfPickPath)::DownCast - (MyPickPathSequence->ShallowCopy ())); - -} diff --git a/src/Visual3d/Visual3d_PickPath.cdl b/src/Visual3d/Visual3d_PickPath.cdl deleted file mode 100644 index 0dc8db154c..0000000000 --- a/src/Visual3d/Visual3d_PickPath.cdl +++ /dev/null @@ -1,138 +0,0 @@ --- Created on: 1991-11-25 --- Created by: NW,JPB,CAL --- Copyright (c) 1991-1999 Matra Datavision --- Copyright (c) 1999-2014 OPEN CASCADE SAS --- --- This file is part of Open CASCADE Technology software library. --- --- This library is free software; you can redistribute it and/or modify it under --- the terms of the GNU Lesser General Public License version 2.1 as published --- by the Free Software Foundation, with special exception defined in the file --- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT --- distribution for complete text of the license and disclaimer of any warranty. --- --- Alternatively, this file may be used under the terms of Open CASCADE --- commercial license or contractual agreement. - -class PickPath from Visual3d - - ---Version: - - ---Purpose: PickPath is a vector ( pick_id, struct_id, elem_num ). - -- It's one of the constituents of a PickDescriptor. - -- There are many PickPaths in a PickDescriptor. - -- Each PickPath describes a structure or a sub-structure. - -- The pick_id is set by SetPickId method from Group. - - ---Keywords: Pick Path, PickId - - ---Warning: - ---References: - -uses - - Structure from Graphic3d - -raises - - PickError from Visual3d - -is - - Create - returns PickPath from Visual3d; - ---Level: Public - ---Purpose: Creates an undefined PickPath. - - Create ( AElemNumber : Integer from Standard; - APickId : Integer from Standard; - AStructure : Structure from Graphic3d) - returns PickPath from Visual3d; - ---Level: Public - ---Purpose: Creates a PickPath : - -- : Element number of the structure picked. - -- : Pick identifier of the structure picked. - -- : The picked structure. - - --------------------------------------------------- - -- Category: Methods to modify the class definition - --------------------------------------------------- - - SetElementNumber ( me : in out; - AElemNumber : Integer from Standard ) - is static; - ---Level: Public - ---Purpose: Modifies the PickPath . - -- : Element number of the structure picked. - ---Category: Methods to modify the class definition - - SetPickIdentifier ( me : in out; - APickId : Integer from Standard ) - is static; - ---Level: Public - ---Purpose: Modifies the PickPath . - -- : Pick identifier of the structure picked. - ---Category: Methods to modify the class definition - - SetStructIdentifier ( me : in out; - AStructure : Structure from Graphic3d ) - is static; - ---Level: Public - ---Purpose: Modifies the PickPath . - -- : Identifier of the structure picked. - ---Category: Methods to modify the class definition - - ---------------------------- - -- Category: Inquire methods - ---------------------------- - - ElementNumber ( me ) - returns Integer from Standard - ---Level: Public - ---Purpose: Returns the element number stocked in the PickPath . - -- Category: Inquire methods - -- Warning: Raises PickError if PickPath is empty (no picked structure). - raises PickError from Visual3d is static; - - PickIdentifier ( me ) - returns Integer from Standard - ---Level: Public - ---Purpose: Returns the pick identifier stocked in the PickPath . - -- Category: Inquire methods - -- Warning: Raises PickError if PickPath is empty (no picked structure). - raises PickError from Visual3d is static; - - StructIdentifier ( me ) - returns Structure from Graphic3d - ---Level: Public - ---Purpose: Returns the structure stocked in the PickPath . - -- Category: Inquire methods - -- Warning: Raises PickError if PickPath is empty (no picked structure). - raises PickError from Visual3d is static; - --- - -fields - --- --- Class : Visual3d_PickPath --- --- Purpose : Declaration of variables specific to the class --- describing a picking. --- --- Reminders : A pick is defined by : --- - a vector (Elem_Num, Pick_Id, Structure) --- --- - - -- the pick vector - MyElementNumber : Integer from Standard; - MyPickId : Integer from Standard; - MyStructure : Structure from Graphic3d; - - -- the flag for definition - MyElementNumberIsDef : Boolean from Standard; - MyPickIdIsDef : Boolean from Standard; - MyStructureIsDef : Boolean from Standard; - -end PickPath; diff --git a/src/Visual3d/Visual3d_PickPath.cxx b/src/Visual3d/Visual3d_PickPath.cxx deleted file mode 100644 index c6c570e222..0000000000 --- a/src/Visual3d/Visual3d_PickPath.cxx +++ /dev/null @@ -1,114 +0,0 @@ -// Created by: NW,JPB,CAL -// Copyright (c) 1991-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//-Version - -//-Design Declaration of variables specific to the classe -// describing a marking. - -//-Warning Marking is defined by : -// - vector (Elem_Num, Pick_Id, Structure) - -//-References - -//-Language C++ 2.0 - -//-Declarations - -// for the class -#include - -//-Aliases - -//-Global data definitions - -// -- le vecteur -// MyElementNumber : Standard_Integer; -// MyPickId : Standard_Integer; -// MyStructure : Structure; - -// -- les flags pour definition -// MyElementNumberIsDef : Standard_Boolean; -// MyPickIdIsDef : Standard_Boolean; -// MyStructureIsDef : Standard_Boolean; - -//-Constructors - -//-Destructors - -//-Methods, in order - -Visual3d_PickPath::Visual3d_PickPath (): -MyElementNumberIsDef (Standard_False), -MyPickIdIsDef (Standard_False), -MyStructureIsDef (Standard_False) { -} - -Visual3d_PickPath::Visual3d_PickPath (const Standard_Integer AnElemNumber, const Standard_Integer APickId, const Handle(Graphic3d_Structure)& AStructure): -MyElementNumber (AnElemNumber), -MyPickId (APickId), -MyStructure (AStructure), -MyElementNumberIsDef (Standard_True), -MyPickIdIsDef (Standard_True), -MyStructureIsDef (Standard_True) { -} - -void Visual3d_PickPath::SetElementNumber (const Standard_Integer AnElemNumber) { - - MyElementNumber = AnElemNumber; - MyElementNumberIsDef = Standard_True; - -} - -void Visual3d_PickPath::SetPickIdentifier (const Standard_Integer APickId) { - - MyPickId = APickId; - MyPickIdIsDef = Standard_True; - -} - -void Visual3d_PickPath::SetStructIdentifier (const Handle(Graphic3d_Structure)& AStructure) { - - MyStructure = AStructure; - MyStructureIsDef = Standard_True; - -} - -Standard_Integer Visual3d_PickPath::ElementNumber () const { - - if (!MyElementNumberIsDef) - Visual3d_PickError::Raise ("No defined ElementNumber"); - - return (MyElementNumber); - -} - -Standard_Integer Visual3d_PickPath::PickIdentifier () const { - - if (!MyPickIdIsDef) - Visual3d_PickError::Raise ("No defined PickIdentifier"); - - return (MyPickId); - -} - -Handle(Graphic3d_Structure) Visual3d_PickPath::StructIdentifier () const { - - if (!MyStructureIsDef) - Visual3d_PickError::Raise ("No defined StructIdentifier"); - - return (MyStructure); - -} diff --git a/src/Visual3d/Visual3d_ViewManager.cdl b/src/Visual3d/Visual3d_ViewManager.cdl index 5a60dfd5c3..bb83ee4be2 100644 --- a/src/Visual3d/Visual3d_ViewManager.cdl +++ b/src/Visual3d/Visual3d_ViewManager.cdl @@ -46,7 +46,6 @@ uses ContextPick from Visual3d, Layer from Visual3d, - PickDescriptor from Visual3d, SetOfView from Visual3d, HSetOfView from Visual3d, View from Visual3d @@ -177,14 +176,6 @@ is -- Pickable as determined by the method -- -- Graphic3d_Structure::SetPick -- -- -- - -- The PickDescriptor is : -- - -- A list of PickPath. -- - -- -- - -- The PickPath is defined by : -- - -- A Structure Identification -- - -- A Pick Identification -- - -- An Element Number. -- - -- -- -- To insert a Pick Identification use the -- -- method Graphic3d_Group::SetPickId -- -- -- diff --git a/src/Visual3d/Visual3d_ViewManager.cxx b/src/Visual3d/Visual3d_ViewManager.cxx index 19666b9468..d1e28c6048 100644 --- a/src/Visual3d/Visual3d_ViewManager.cxx +++ b/src/Visual3d/Visual3d_ViewManager.cxx @@ -67,7 +67,6 @@ #include #include -#include #include #if defined (_WIN32) || defined(__WIN32__) diff --git a/src/WNT/WNT_Dword.hxx b/src/WNT/WNT_Dword.hxx index fd9553a069..0c74750973 100644 --- a/src/WNT/WNT_Dword.hxx +++ b/src/WNT/WNT_Dword.hxx @@ -39,6 +39,4 @@ typedef DWORD WNT_Dword; -extern const Handle( Standard_Type )& STANDARD_TYPE( WNT_Dword ); - #endif // __WNT_Dword_HeaderFile diff --git a/src/WNT/WNT_Uint.hxx b/src/WNT/WNT_Uint.hxx index 0bc8d485b4..88dd013cee 100644 --- a/src/WNT/WNT_Uint.hxx +++ b/src/WNT/WNT_Uint.hxx @@ -39,6 +39,4 @@ typedef UINT WNT_Uint; -extern const Handle( Standard_Type )& STANDARD_TYPE( WNT_Uint ); - #endif // __WNT_Uint_HeaderFile diff --git a/src/WNT/WNT_WindowData.hxx b/src/WNT/WNT_WindowData.hxx index 980e61ae99..0a03ba05e9 100644 --- a/src/WNT/WNT_WindowData.hxx +++ b/src/WNT/WNT_WindowData.hxx @@ -41,6 +41,4 @@ typedef WINDOW_DATA WNT_WindowData; -extern const Handle( Standard_Type )& STANDARD_TYPE( WNT_WindowData ); - #endif // __WNT_WindowData_HeaderFile