0024737: Coding - remove <br> tag from header files

Eliminate #ifdefs around #includes, some unnecessary includes and macros
2025-08-14 13:30:48 +03:00 · 2014-03-20 14:12:12 +04:00
parent df80c6ddda
commit ebc93ae74f
130 changed files with 563 additions and 1555 deletions
--- a/src/Standard/Handle_Standard_Persistent.hxx
+++ b/src/Standard/Handle_Standard_Persistent.hxx
@@ -20,18 +20,9 @@
 #ifndef _Handle_Standard_Persistent_HeaderFile
 #define _Handle_Standard_Persistent_HeaderFile

-#ifndef _Standard_DefineAlloc_HeaderFile
 #include <Standard_DefineAlloc.hxx>
-#endif
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_PrimitiveTypes_HeaderFile
-#include <Standard_PrimitiveTypes.hxx>
-#endif
-#ifndef _Standard_Persistent_proto_HeaderFile
+#include <Standard_TypeDef.hxx>
 #include <Standard_Persistent_proto.hxx>
-#endif

 #ifdef _WIN32
 // Disable the warning "conversion from 'unsigned int' to Standard_Persistent *"
--- a/src/Standard/Handle_Standard_Transient.hxx
+++ b/src/Standard/Handle_Standard_Transient.hxx
@@ -14,21 +14,11 @@

 #ifndef _Handle_Standard_Transient_HeaderFile
 #define _Handle_Standard_Transient_HeaderFile
-#ifndef _Standard_HeaderFile
+
 #include <Standard.hxx>
-#endif
-#ifndef _Standard_DefineAlloc_HeaderFile
 #include <Standard_DefineAlloc.hxx>
-#endif
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_PrimitiveTypes_HeaderFile
 #include <Standard_PrimitiveTypes.hxx>
-#endif
-#ifndef _Standard_Transient_proto_HeaderFile
 #include <Standard_Transient_proto.hxx>
-#endif

 #ifdef _WIN32
 // Disable the warning "conversion from 'unsigned int' to Standard_Transient *"
--- a/src/Standard/Standard_Address.hxx
+++ b/src/Standard/Standard_Address.hxx
@@ -26,15 +26,7 @@
 # include <string.h>
 //typedef void* Standard_Address;

-
-#ifndef _Standard_TypeDef_HeaderFile
-#include <Standard_TypeDef.hxx>
-#endif
-
-#ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
-#endif
-

 class Handle_Standard_Type;

--- a/src/Standard/Standard_Boolean.cxx
+++ b/src/Standard/Standard_Boolean.cxx
@@ -14,12 +14,8 @@

 #include <Standard_Boolean.hxx>
 #include <Standard_RangeError.hxx>
-#ifndef _Standard_Stream_HeaderFile
 #include <Standard_Stream.hxx>
-#endif
-#ifndef _Standard_OStream_HeaderFile
 #include <Standard_OStream.hxx>
-#endif

 const Handle_Standard_Type& Standard_Boolean_Type_() 
 {
--- a/src/Standard/Standard_Character.cxx
+++ b/src/Standard/Standard_Character.cxx
@@ -21,13 +21,8 @@
 #include <Standard_Character.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_RangeError.hxx>
-#ifndef _Standard_Stream_HeaderFile
 #include <Standard_Stream.hxx>
-#endif
-#ifndef _Standard_OStream_HeaderFile
 #include <Standard_OStream.hxx>
-#endif
-
 #include <Standard_Type.hxx>

 const Handle_Standard_Type& Standard_Character_Type_() 
--- a/src/Standard/Standard_DefineHandle.hxx
+++ b/src/Standard/Standard_DefineHandle.hxx
@@ -15,9 +15,7 @@
 #ifndef _Standard_DefineHandle_HeaderFile
 #define _Standard_DefineHandle_HeaderFile

-#ifndef _Standard_Macro_HeaderFile
 #include <Standard_Macro.hxx>
-#endif

 class Standard_Transient;
 class Standard_Persistent;
--- a/src/Standard/Standard_ExtCharacter.cxx
+++ b/src/Standard/Standard_ExtCharacter.cxx
@@ -21,14 +21,9 @@
 #include <Standard_ExtCharacter.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_RangeError.hxx>
-
 #include <Standard_Type.hxx>
-#ifndef _Standard_Stream_HeaderFile
 #include <Standard_Stream.hxx>
-#endif
-#ifndef _Standard_OStream_HeaderFile
 #include <Standard_OStream.hxx>
-#endif

 const Handle_Standard_Type& Standard_ExtCharacter_Type_() 
 {
--- a/src/Standard/Standard_ExtString.hxx
+++ b/src/Standard/Standard_ExtString.hxx
@@ -22,10 +22,7 @@
 #ifndef _Standard_ExtString_HeaderFile
 #define _Standard_ExtString_HeaderFile

-
-#ifndef _Standard_TypeDef_HeaderFile
 #include <Standard_TypeDef.hxx>
-#endif

 class Handle_Standard_Type;

--- a/src/Standard/Standard_IStream.hxx
+++ b/src/Standard/Standard_IStream.hxx
@@ -15,12 +15,9 @@
 #ifndef _Standard_IStream_HeaderFile
 #define _Standard_IStream_HeaderFile

-#ifndef _Standard_Macro_HeaderFile
 #include <Standard_Macro.hxx>
-#endif
 #include <Standard_Stream.hxx>

-
 class Handle_Standard_Type;

 __Standard_API const Handle_Standard_Type& Standard_IStream_Type_();
--- a/src/Standard/Standard_Integer.cxx
+++ b/src/Standard/Standard_Integer.cxx
@@ -16,12 +16,8 @@
 #include <Standard_Integer.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_RangeError.hxx>
-#ifndef _Standard_Stream_HeaderFile
 #include <Standard_Stream.hxx>
-#endif
-#ifndef _Standard_OStream_HeaderFile
 #include <Standard_OStream.hxx>
-#endif

 // ------------------------------------------------------------------
 // CharToInt : Converts a character in an integer value
--- a/src/Standard/Standard_Integer.hxx
+++ b/src/Standard/Standard_Integer.hxx
@@ -15,13 +15,8 @@
 #ifndef _Standard_Integer_HeaderFile
 #define _Standard_Integer_HeaderFile

-#ifndef _Standard_TypeDef_HeaderFile
 #include <Standard_TypeDef.hxx>
-#endif
-
-#ifndef _Standard_values_HeaderFile
 # include <Standard_values.h>
-#endif

 class Handle_Standard_Type;

--- a/src/Standard/Standard_MMgrOpt.hxx
+++ b/src/Standard/Standard_MMgrOpt.hxx
@@ -16,25 +16,8 @@
 #ifndef _Standard_MMgrOpt_HeaderFile
 #define _Standard_MMgrOpt_HeaderFile

-#ifndef _Standard_Address_HeaderFile
-#include <Standard_Address.hxx>
-#endif
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-#ifndef _Standard_Boolean_HeaderFile
-#include <Standard_Boolean.hxx>
-#endif
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_MMgrRoot_HeaderFile
 #include <Standard_MMgrRoot.hxx>
-#endif
-#ifndef _Standard_Mutex_HeaderFile
 #include <Standard_Mutex.hxx>
-#endif
-#include <Standard_Size.hxx>

 /**
 * @brief Open CASCADE memory manager optimized for speed.
@@ -76,7 +59,6 @@
 * blocks is usually less costly than directly by malloc since allocation is made
 * once (when allocating a pool) and overheads induced by malloc are minimized.
 */
-
 class Standard_MMgrOpt : public Standard_MMgrRoot
 {
 public:
@@ -111,13 +93,11 @@ class Standard_MMgrOpt : public Standard_MMgrRoot
  //! Returns number of actually freed blocks
  Standard_EXPORT virtual Standard_Integer Purge(Standard_Boolean isDestroyed);

-  //! Declaration of a type pointer to the callback function that
-  //! should accept the following arguments: <br>
-  //! theIsAlloc - true if the data is allocated, false if it is freed; <br>
-  //! theStorage - address of the allocated/freed block <br>
-  //! theRoundSize - the real rounded size of the block <br>
-  //! theSize - the size of the block that was requested by application
-  //!           (this value is correct only if theIsAlloc is true)
+  //! Declaration of a type pointer to the callback function that should accept the following arguments:
+  //! @param theIsAlloc   true if the data is allocated, false if it is freed
+  //! @param theStorage   address of the allocated/freed block
+  //! @param theRoundSize the real rounded size of the block
+  //! @param theSize      the size of the block that was requested by application (this value is correct only if theIsAlloc is true)
  typedef void (*TPCallBackFunc)(const Standard_Boolean theIsAlloc,
                                 const Standard_Address theStorage,
                                 const Standard_Size theRoundSize,
--- a/src/Standard/Standard_MMgrRaw.hxx
+++ b/src/Standard/Standard_MMgrRaw.hxx
@@ -16,18 +16,7 @@
 #ifndef _Standard_MMgrRaw_HeaderFile
 #define _Standard_MMgrRaw_HeaderFile

-#ifndef _Standard_Address_HeaderFile
-#include <Standard_Address.hxx>
-#endif
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_MMgrRoot_HeaderFile
 #include <Standard_MMgrRoot.hxx>
-#endif

 /**
 * Implementation of raw OCC memory manager which uses standard C
--- a/src/Standard/Standard_MMgrRoot.hxx
+++ b/src/Standard/Standard_MMgrRoot.hxx
@@ -16,15 +16,7 @@
 #ifndef _Standard_MMgrRoot_HeaderFile
 #define _Standard_MMgrRoot_HeaderFile

-#ifndef _Standard_Address_HeaderFile
-#include <Standard_Address.hxx>
-#endif
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
+#include <Standard_TypeDef.hxx>

 /** 
 * Root class for Open CASCADE mmemory managers.
--- a/src/Standard/Standard_MMgrTBBalloc.hxx
+++ b/src/Standard/Standard_MMgrTBBalloc.hxx
@@ -16,18 +16,7 @@
 #ifndef _Standard_MMgrTBBalloc_HeaderFile
 #define _Standard_MMgrTBBalloc_HeaderFile

-#ifndef _Standard_Address_HeaderFile
-#include <Standard_Address.hxx>
-#endif
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_MMgrRoot_HeaderFile
 #include <Standard_MMgrRoot.hxx>
-#endif

 //!
 //! Implementation of OCC memory manager which uses Intel TBB
--- a/src/Standard/Standard_OId.hxx
+++ b/src/Standard/Standard_OId.hxx
@@ -15,13 +15,8 @@
 #ifndef _Standard_OId_HeaderFile
 #define _Standard_OId_HeaderFile

-#ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
-#endif
-
-#ifndef _Standard_OStream_HeaderFile
 #include <Standard_OStream.hxx>
-#endif

 class Standard_Persistent;
 typedef Standard_Persistent* Standard_OId;
--- a/src/Standard/Standard_OStream.hxx
+++ b/src/Standard/Standard_OStream.hxx
@@ -15,12 +15,8 @@
 #ifndef _Standard_OStream_HeaderFile
 #define _Standard_OStream_HeaderFile

-#ifndef _Standard_Macro_HeaderFile
 #include <Standard_TypeDef.hxx>
-#endif
-#ifndef _Standard_Stream_HeaderFile
 #include <Standard_Stream.hxx>
-#endif

 class Handle_Standard_Type;

--- a/src/Standard/Standard_Persistent_proto.hxx
+++ b/src/Standard/Standard_Persistent_proto.hxx
@@ -15,18 +15,9 @@
 #ifndef _Standard_Persistent_proto_HeaderFile
 #define _Standard_Persistent_proto_HeaderFile

-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_DefineAlloc_HeaderFile
-#include <Standard_DefineAlloc.hxx>
-#endif
-#ifndef _Standard_PrimitiveTypes_HeaderFile
-#include <Standard_PrimitiveTypes.hxx>
-#endif
-#ifndef _Standard_HeaderFile
 #include <Standard.hxx>
-#endif
+#include <Standard_TypeDef.hxx>
+#include <Standard_OStream.hxx>

 class Standard_Type;
 class Handle_Standard_Type;
--- a/src/Standard/Standard_PrimitiveTypes.hxx
+++ b/src/Standard/Standard_PrimitiveTypes.hxx
@@ -24,36 +24,17 @@ class Handle_Standard_Type;
 class Handle_Standard_Transient;
 class Standard_Transient;

-#ifndef _Standard_Macro_HeaderFile
 #include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_Boolean_HeaderFile
+
 #include <Standard_Boolean.hxx>
-#endif
-#ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
-#endif
-#ifndef _Standard_Real_HeaderFile
 #include <Standard_Real.hxx>
-#endif
-#ifndef _Standard_Character_HeaderFile
 #include <Standard_Character.hxx>
-#endif
-#ifndef _Standard_ExtCharacter_HeaderFile
 #include <Standard_ExtCharacter.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
 #include <Standard_CString.hxx>
-#endif
-#ifndef _Standard_ExtString_HeaderFile
 #include <Standard_ExtString.hxx>
-#endif
-#ifndef _Standard_Address_HeaderFile
 #include <Standard_Address.hxx>
-#endif
-#ifndef _Standard_Storable_HeaderFile
 #include <Standard_Storable.hxx>
-#endif

 __Standard_API Standard_Address ShallowCopy(const Standard_Address, 
 		     const Handle_Standard_Type& );
--- a/src/Standard/Standard_Real.cxx
+++ b/src/Standard/Standard_Real.cxx
@@ -17,12 +17,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_NumericError.hxx>
 #include <Standard_NullValue.hxx>
-#ifndef _Standard_Stream_HeaderFile
 #include <Standard_Stream.hxx>
-#endif
-#ifndef _Standard_OStream_HeaderFile
 #include <Standard_OStream.hxx>
-#endif

 const Handle_Standard_Type& Standard_Real_Type_() 
 {
--- a/src/Standard/Standard_Real.hxx
+++ b/src/Standard/Standard_Real.hxx
@@ -17,17 +17,9 @@

 #include <float.h>
 #include <math.h>
-#ifndef _Standard_values_HeaderFile
-# include <Standard_values.h>
-#endif
-
-#ifdef WNT
-# include <Standard_math.hxx>
-#endif
-
-#ifndef _Standard_TypeDef_HeaderFile
+#include <Standard_values.h>
+#include <Standard_math.hxx>
 #include <Standard_TypeDef.hxx>
-#endif

 class Handle_Standard_Type;

--- a/src/Standard/Standard_SStream.hxx
+++ b/src/Standard/Standard_SStream.hxx
@@ -17,9 +17,7 @@
 #ifndef _Standard_SStream_HeaderFile
 #define _Standard_SStream_HeaderFile

-#ifndef _Standard_Stream_HeaderFile
 #include <Standard_Stream.hxx>
-#endif

 #ifdef USE_STL_STREAM

--- a/src/Standard/Standard_ShortReal.cxx
+++ b/src/Standard/Standard_ShortReal.cxx
@@ -15,13 +15,8 @@
 #include <Standard_ShortReal.hxx>
 #include <Standard_RangeError.hxx>
 #include <Standard_NullValue.hxx>
-
-#ifndef _Standard_Stream_HeaderFile
 #include <Standard_Stream.hxx>
-#endif
-#ifndef _Standard_OStream_HeaderFile
 #include <Standard_OStream.hxx>
-#endif

 const Handle_Standard_Type& Standard_ShortReal_Type_() 
 {
--- a/src/Standard/Standard_ShortReal.hxx
+++ b/src/Standard/Standard_ShortReal.hxx
@@ -17,14 +17,9 @@

 #include <float.h>
 #include <math.h>
-#ifndef _Standard_values_HeaderFile
-# include <Standard_values.h>
-#endif

-
-#ifndef _Standard_TypeDef_HeaderFile
+#include <Standard_values.h>
 #include <Standard_TypeDef.hxx>
-#endif

 class Handle_Standard_Type;

--- a/src/Standard/Standard_Stream.hxx
+++ b/src/Standard/Standard_Stream.hxx
@@ -23,9 +23,7 @@
 #ifndef _Standard_Stream_HeaderFile
 #define _Standard_Stream_HeaderFile

-#ifndef _Standard_Macro_HeaderFile
 #include <Standard_Macro.hxx>
-#endif

 #ifdef USE_STL_STREAM
 #undef USE_STL_STREAM
--- a/src/Standard/Standard_Time.hxx
+++ b/src/Standard/Standard_Time.hxx
@@ -14,9 +14,7 @@
 #ifndef _Standard_Time_HeaderFile
 #define _Standard_Time_HeaderFile

-#ifndef _Standard_TypeDef_HeaderFile
 #include <Standard_TypeDef.hxx>
-#endif

 class Handle_Standard_Type;

--- a/src/Standard/Standard_Transient.hxx
+++ b/src/Standard/Standard_Transient.hxx
@@ -15,17 +15,9 @@
 #ifndef _Standard_Transient_HeaderFile
 #define _Standard_Transient_HeaderFile

-#ifndef _Handle_Standard_Transient_HeaderFile
 #include <Handle_Standard_Transient.hxx>
-#endif
-#ifndef _Standard_PrimitiveTypes_HeaderFile
 #include <Standard_PrimitiveTypes.hxx>
-#endif
-#ifndef _Standard_Transient_proto_HeaderFile
 #include <Standard_Transient_proto.hxx>
-#endif
-#ifndef _Standard_Type_HeaderFile
 #include <Standard_Type.hxx>
-#endif

 #endif 
--- a/src/Standard/Standard_Transient_proto.hxx
+++ b/src/Standard/Standard_Transient_proto.hxx
@@ -15,15 +15,9 @@
 #ifndef _Standard_Transient_proto_HeaderFile
 #define _Standard_Transient_proto_HeaderFile

-#ifndef _Standard_DefineAlloc_HeaderFile
 #include <Standard_DefineAlloc.hxx>
-#endif
-#ifndef _Standard_Macro_HeaderFile
 #include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
 #include <Standard.hxx>
-#endif

 class Handle_Standard_Transient;
 class Standard_Type;
--- a/src/Standard/Standard_TypeDef.hxx
+++ b/src/Standard/Standard_TypeDef.hxx
@@ -52,9 +52,7 @@
 #define Standard_False (Standard_Boolean)0
 #define Standard_True  (Standard_Boolean)1

-#ifndef _Standard_Macro_HeaderFile
 #include <Standard_Macro.hxx>
-#endif

 typedef int           Standard_Integer;
 typedef double        Standard_Real;