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

[davyw]

The following commit has been merged in the upstream branch:
commit abcf0096ca722486a3ced6270e39cf81c70810cf
Author: davyw <davy.wouters at gmail.com>
Date:   Mon Jan 16 13:42:55 2012 +0100

    Resolves a possible bcc32 compiler bug.
    
    For some reason the bcc32 compiler (v6.20 and up) fails to build these
    files and generates an internal compiler error. When language exceptions
    are disabled, this issue is solved.

diff --git a/src/OpenGl/OpenGl_attri.cxx b/src/OpenGl/OpenGl_attri.cxx
index ac2b8e1..e40d6c8 100644
--- a/src/OpenGl/OpenGl_attri.cxx
+++ b/src/OpenGl/OpenGl_attri.cxx
@@ -81,6 +81,11 @@ used in immediat mode context.
 /*#define BUC60918*/        /*GG CADPAK_V2/RINA Enable transparency using Zbuffer
                             */
 
+/* Workaround for internal bcc32 compiler bug? */						
+#ifdef __BORLANDC__
+#pragma option -x-
+#endif						
+	
 /*----------------------------------------------------------------------*/
 /*
 * Constantes
diff --git a/src/OpenGl/OpenGl_depthcue.cxx b/src/OpenGl/OpenGl_depthcue.cxx
index df4e458..5f3b131 100644
--- a/src/OpenGl/OpenGl_depthcue.cxx
+++ b/src/OpenGl/OpenGl_depthcue.cxx
@@ -18,6 +18,11 @@ xx-xx-xx : xxx ; Creation.
 
 ************************************************************************/
 
+/* Workaround for internal bcc32 compiler bug? */						
+#ifdef __BORLANDC__
+#pragma option -x-
+#endif
+
 /*----------------------------------------------------------------------*/
 /*
 * Includes
diff --git a/src/OpenGl/OpenGl_pick.cxx b/src/OpenGl/OpenGl_pick.cxx
index f1ee3c3..1162e41 100644
--- a/src/OpenGl/OpenGl_pick.cxx
+++ b/src/OpenGl/OpenGl_pick.cxx
@@ -16,6 +16,11 @@ xx-xx-xx : xxx ; Creation.
 
 ************************************************************************/
 
+/* Workaround for internal bcc32 compiler bug? */						
+#ifdef __BORLANDC__
+#pragma option -x-
+#endif						
+
 /*----------------------------------------------------------------------*/
 /*
 * Includes
diff --git a/src/OpenGl/OpenGl_telem_util.cxx b/src/OpenGl/OpenGl_telem_util.cxx
index 92bcbb2..fb26b62 100644
--- a/src/OpenGl/OpenGl_telem_util.cxx
+++ b/src/OpenGl/OpenGl_telem_util.cxx
@@ -53,6 +53,11 @@ when a face has confused or aligned points.
 */
 #define QTOCC_PATCH
 
+/* Workaround for internal bcc32 compiler bug? */						
+#ifdef __BORLANDC__
+#pragma option -x-
+#endif						
+
 /*----------------------------------------------------------------------*/
 /*
 * Includes
diff --git a/src/OpenGl/OpenGl_undefined.cxx b/src/OpenGl/OpenGl_undefined.cxx
index 9b29a16..dccb6a5 100644
--- a/src/OpenGl/OpenGl_undefined.cxx
+++ b/src/OpenGl/OpenGl_undefined.cxx
@@ -25,6 +25,11 @@ Suppression call_tox_set_colormap_mapping()
 
 ************************************************************************/
 
+/* Workaround for internal bcc32 compiler bug? */						
+#ifdef __BORLANDC__
+#pragma option -x-
+#endif						
+
 /*----------------------------------------------------------------------*/
 /*
 * Includes
diff --git a/src/OpenGl/OpenGl_view.cxx b/src/OpenGl/OpenGl_view.cxx
index 3402ce1..67044e2 100644
--- a/src/OpenGl/OpenGl_view.cxx
+++ b/src/OpenGl/OpenGl_view.cxx
@@ -64,6 +64,10 @@ from higher API */
 if any was defined
 */
 
+/* Workaround for internal bcc32 compiler bug? */						
+#ifdef __BORLANDC__
+#pragma option -x-
+#endif						
 
 /*----------------------------------------------------------------------*/
 /*

-- 
OCE packaging