[SCM] OCE packaging branch, upstream, updated. OCE-0.6.0-230-g17bea23

[Denis Barbier]

The following commit has been merged in the upstream branch:
commit f662947f7bd03b10baf2899f980b3fb86d6f6639
Author: Fotios Sioutis <sfotis at gmail.com>
Date:   Thu Dec 15 20:46:52 2011 +0200

    Resolved issue with local variable in singleton
    
    bcc needs a local object (stack) to have its destructor public
    even when created from within scope. (bcc32 bug)

diff --git a/src/BRepMesh/BRepMesh_DiscretFactory.cxx b/src/BRepMesh/BRepMesh_DiscretFactory.cxx
index 69f3402..6d4ce30 100644
--- a/src/BRepMesh/BRepMesh_DiscretFactory.cxx
+++ b/src/BRepMesh/BRepMesh_DiscretFactory.cxx
@@ -74,9 +74,14 @@ void BRepMesh_DiscretFactory::Clear()
 //=======================================================================
 BRepMesh_DiscretFactory& BRepMesh_DiscretFactory::Get()
 {
+#ifdef __BORLANDC__
+  static BRepMesh_DiscretFactory* sFactory = new BRepMesh_DiscretFactory;
+  return *sFactory;
+#else
   //! global factory instance
   static BRepMesh_DiscretFactory THE_GLOBAL_FACTORY;
   return THE_GLOBAL_FACTORY;
+#endif
 }
 
 //=======================================================================

-- 
OCE packaging