Fix compilation errors.

diff --git a/src/StepRepr/StepRepr_FeatureForDatumTargetRelationship.cxx b/src/StepRepr/StepRepr_FeatureForDatumTargetRelationship.cxx
new file mode 100644 (file)
index 0000000..4e2bb8a
--- /dev/null
+++ b/src/StepRepr/StepRepr_FeatureForDatumTargetRelationship.cxx
@@ -0,0 +1,29 @@
+// Created on: 2000-04-18
+// Created by: Andrey BETENEV
+// 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.
+
+// Generator:  ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
+
+#include <Standard_Type.hxx>
+#include <StepRepr_ShapeAspect.hxx>
+#include <StepRepr_FeatureForDatumTargetRelationship.hxx>
+
+//=======================================================================
+//function : StepRepr_FeatureForDatumtargetRelationship
+//purpose  : 
+//=======================================================================
+
+StepRepr_FeatureForDatumTargetRelationship::StepRepr_FeatureForDatumTargetRelationship ()
+{
+}
\ No newline at end of file

diff --git a/src/StepRepr/StepRepr_FeatureForDatumTargetRelationship.hxx b/src/StepRepr/StepRepr_FeatureForDatumTargetRelationship.hxx
new file mode 100644 (file)
index 0000000..887e6ac
--- /dev/null
+++ b/src/StepRepr/StepRepr_FeatureForDatumTargetRelationship.hxx
@@ -0,0 +1,59 @@
+// Created on: 2000-04-18
+// Created by: Andrey BETENEV
+// 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.
+
+#ifndef _StepRepr_FeatureForDatumtargetRelationship_HeaderFile
+#define _StepRepr_FeatureForDatumtargetRelationship_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <StepRepr_ShapeAspectRelationship.hxx>
+
+
+class StepRepr_FeatureForDatumTargetRelationship;
+DEFINE_STANDARD_HANDLE(StepRepr_FeatureForDatumTargetRelationship, StepRepr_ShapeAspectRelationship)
+
+//! Representation of STEP entity DimensionalLocation
+class StepRepr_FeatureForDatumTargetRelationship : public StepRepr_ShapeAspectRelationship
+{
+
+public:
+
+  
+  //! Empty constructor
+  Standard_EXPORT StepRepr_FeatureForDatumTargetRelationship();
+
+
+  DEFINE_STANDARD_RTTI(StepRepr_FeatureForDatumTargetRelationship,StepRepr_ShapeAspectRelationship)
+
+protected:
+
+
+
+
+private:
+
+
+
+
+};
+
+
+
+
+
+
+
+#endif // _StepRepr_FeatureForDatumtargetRelationship_HeaderFile

diff --git a/src/StepRepr/StepRepr_FeatureForDatumtargetRelationship.cxx b/src/StepRepr/StepRepr_FeatureForDatumtargetRelationship.cxx
deleted file mode 100644 (file)
index 4e2bb8a..0000000
--- a/src/StepRepr/StepRepr_FeatureForDatumtargetRelationship.cxx
+++ /dev/null
@@ -1,29 +0,0 @@
-// Created on: 2000-04-18
-// Created by: Andrey BETENEV
-// 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.
-
-// Generator:  ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
-
-#include <Standard_Type.hxx>
-#include <StepRepr_ShapeAspect.hxx>
-#include <StepRepr_FeatureForDatumTargetRelationship.hxx>
-
-//=======================================================================
-//function : StepRepr_FeatureForDatumtargetRelationship
-//purpose  : 
-//=======================================================================
-
-StepRepr_FeatureForDatumTargetRelationship::StepRepr_FeatureForDatumTargetRelationship ()
-{
-}
\ No newline at end of file

diff --git a/src/StepRepr/StepRepr_FeatureForDatumtargetRelationship.hxx b/src/StepRepr/StepRepr_FeatureForDatumtargetRelationship.hxx
deleted file mode 100644 (file)
index 887e6ac..0000000
--- a/src/StepRepr/StepRepr_FeatureForDatumtargetRelationship.hxx
+++ /dev/null
@@ -1,59 +0,0 @@
-// Created on: 2000-04-18
-// Created by: Andrey BETENEV
-// 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.
-
-#ifndef _StepRepr_FeatureForDatumtargetRelationship_HeaderFile
-#define _StepRepr_FeatureForDatumtargetRelationship_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <StepRepr_ShapeAspectRelationship.hxx>
-
-
-class StepRepr_FeatureForDatumTargetRelationship;
-DEFINE_STANDARD_HANDLE(StepRepr_FeatureForDatumTargetRelationship, StepRepr_ShapeAspectRelationship)
-
-//! Representation of STEP entity DimensionalLocation
-class StepRepr_FeatureForDatumTargetRelationship : public StepRepr_ShapeAspectRelationship
-{
-
-public:
-
-  
-  //! Empty constructor
-  Standard_EXPORT StepRepr_FeatureForDatumTargetRelationship();
-
-
-  DEFINE_STANDARD_RTTI(StepRepr_FeatureForDatumTargetRelationship,StepRepr_ShapeAspectRelationship)
-
-protected:
-
-
-
-
-private:
-
-
-
-
-};
-
-
-
-
-
-
-
-#endif // _StepRepr_FeatureForDatumtargetRelationship_HeaderFile

diff --git a/src/XCAFDoc/XCAFDoc_Datum.cxx b/src/XCAFDoc/XCAFDoc_Datum.cxx
index 666b30cebf60340dae2a78367f42fea3fe66e184..3e7a07a50bc7f88d8e42ce985d94bb2b1a602dae 100644 (file)
--- a/src/XCAFDoc/XCAFDoc_Datum.cxx
+++ b/src/XCAFDoc/XCAFDoc_Datum.cxx
@@ -309,8 +309,12 @@ Handle(XCAFDimTolObjects_DatumObject) XCAFDoc_Datum::GetObject() const
   {
     anObj->IsDatumTarget((aIsDTarget->Get() != 0));
   }
+  else
+  {
+    return anObj;
+  }
 
-  if (aIsDTarget != 0)
+  if (aIsDTarget->Get() != 0)
   {
     Handle(TDataStd_Integer) aDTargetType;
     if(Label().FindChild(ChildLab_DTargetType).FindAttribute(TDataStd_Integer::GetID(), aDTargetType))