Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7

[modules/hydro.git] / src / HYDROData / HYDROData_NaturalObject.h

diff --git a/src/HYDROData/HYDROData_NaturalObject.h b/src/HYDROData/HYDROData_NaturalObject.h
index 2b0ebe63b629e66cd64118d7e05414c68cd5511c..ecc4736a5a8ddc4e5e4f9aa0d7e29bfd89004c51 100644 (file)
--- a/src/HYDROData/HYDROData_NaturalObject.h
+++ b/src/HYDROData/HYDROData_NaturalObject.h
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
@@ -25,9 +21,6 @@
 
 #include <HYDROData_Object.h>
 
-DEFINE_STANDARD_HANDLE(HYDROData_NaturalObject, HYDROData_Object)
-
-
 /**\class HYDROData_NaturalObject
  * \brief The natural objects are objects of environment not created by human.
  *
@@ -44,7 +37,7 @@ protected:
   };
 
 public:
-  DEFINE_STANDARD_RTTI(HYDROData_NaturalObject);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_NaturalObject, HYDROData_Object);
 
 protected:
 
@@ -52,7 +45,7 @@ protected:
    * Creates new object in the internal data structure. Use higher level objects 
    * to create objects with real content.
    */
-  HYDRODATA_EXPORT HYDROData_NaturalObject();
+  HYDRODATA_EXPORT HYDROData_NaturalObject( Geometry );
 
   /**
    * Destructs properties of the object and object itself, removes it from the document.