From: kgv <kgv@opencascade.com>
Date: Thu, 23 Oct 2014 14:40:12 +0000 (+0400)
Subject: 0025411: BVH package - eliminate warning about hidden overloaded method ::Box
X-Git-Tag: V6_8_0~55
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=5e6a855aa9af89f3fd2cdc54b074ef0fd72ae161;p=occt-copy.git

0025411: BVH package - eliminate warning about hidden overloaded method ::Box

Correction of merge error

Fix for compilation
---

diff --git a/src/OpenGl/OpenGl_SceneGeometry.hxx b/src/OpenGl/OpenGl_SceneGeometry.hxx
index 4d99186d2b..f5c854547e 100755
--- a/src/OpenGl/OpenGl_SceneGeometry.hxx
+++ b/src/OpenGl/OpenGl_SceneGeometry.hxx
@@ -174,26 +174,14 @@ public:
   void SetMaterialIndex (Standard_Integer theMatID)
   {
     for (Standard_Size anIdx = 0; anIdx < Elements.size(); ++anIdx)
-      Elements[anIdx].w() = aMatID;
-  }
-
-  //! Returns AABB of the given object.
-  using BVH_Triangulation<Standard_ShortReal, 4>::Box;
-
-  //! Returns AABB of primitive set.
-  BVH_BoxNt Box() const
-  {
-    const BVH_Transform<Standard_ShortReal, 4>* aTransform = 
-      dynamic_cast<const BVH_Transform<Standard_ShortReal, 4>* > (Properties().operator->());
- 
-    BVH_BoxNt aBox = BVH_PrimitiveSet<Standard_ShortReal, 4>::Box(); 
- 
-    if (aTransform)
     {
       Elements[anIdx].w() = theMatID;
     }
   }
 
+  //! Returns AABB of the given object.
+  using BVH_Triangulation<Standard_ShortReal, 3>::Box;
+
   //! Returns AABB of primitive set.
   BVH_BoxNt Box() const;