From 82bebaaf4c6af6a9bd252d3f4d477513b601ce42 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Mon, 8 Oct 2012 14:06:33 +0000
Subject: [PATCH] Merge from V6_main (04/10/2012)

---
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx  | 2 +-
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx  | 2 +-
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx    | 2 ++
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx    | 2 +-
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx  | 3 ++-
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx | 2 +-
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx            | 3 ++-
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx         | 6 +++---
 8 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx
index 1dc0e31..83cac7d 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx
@@ -53,7 +53,7 @@
 
 
 #ifdef _DEBUG_
-static int MYDEBUG = 1;
+static int MYDEBUG = HEXA_NS::on_debug ();
 #else
 static int MYDEBUG = 0;
 #endif
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
index aac1fa8..1c9a623 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
@@ -25,7 +25,7 @@
 #define __SMESH_HexaFromSkin_3D_HXX__
 
 #include "SMESH_StdMeshers.hxx"
-#include "SMESH_3D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 // from HexaBlocks
 #include "hexa_base.hxx" 
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx
index 9c5fdca..227d77b 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx
@@ -34,6 +34,7 @@
 
 #include "SMESH_Gen.hxx"
 #include "SMESH_Mesh.hxx"
+#include "SMESH_subMesh.hxx"
 #include "SMESH_MesherHelper.hxx"
 
 #include "HEXABLOCKPlugin_mesh.hxx"
@@ -151,6 +152,7 @@ bool HEXABLOCKPlugin_HEXABLOCK::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
       default: return( Compute3D(theMesh) );
     };
   }
+  return false;
 }
 
 //=============================================================================
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
index 5817a42..2bef9c9 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
@@ -27,7 +27,7 @@
 #ifndef _HEXABLOCKPlugin_HEXABLOCK_HXX_
 #define _HEXABLOCKPlugin_HEXABLOCK_HXX_
 
-#include "SMESH_3D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 #include "SMESH_Mesh.hxx"
 
 class SMESH_Mesh;
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx
index 65428ab..45a7390 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx
@@ -28,9 +28,10 @@
 #include "HEXABLOCKPlugin_HEXABLOCK.hxx"
 
 #include "utilities.h"
+#include "hexa_base.hxx"
 
 #ifdef _DEBUG_
-static int MYDEBUG = 1;
+static int MYDEBUG = HEXA_NS::on_debug ();
 #else
 static int MYDEBUG = 0;
 #endif
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx
index 4e864ea..ee28583 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx
@@ -33,7 +33,7 @@
 #include <utilities.h>
 
 #ifdef _DEBUG_
-static int MYDEBUG = 1;
+static int MYDEBUG = HEXA_NS::on_debug ();
 #else
 static int MYDEBUG = 0;
 #endif
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx
index 01c0968..6431635 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx
@@ -30,9 +30,10 @@
 #include "HEXABLOCKPlugin_HEXABLOCK_i.hxx"
 #include "HEXABLOCKPlugin_Hypothesis_i.hxx"
 
+#include "hexa_base.hxx"
 
 #ifdef _DEBUG_
-static int MYDEBUG = 1;
+static int MYDEBUG = HEXA_NS::on_debug ();
 #else
 static int MYDEBUG = 0;
 #endif
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
index b0a2c6a..6d94b97 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
@@ -89,7 +89,7 @@
 #endif
 
 #ifdef _DEBUG_
-static int MYDEBUG = 1;
+static int MYDEBUG = HEXA_NS::on_debug ();
 #else
 static int MYDEBUG = 0;
 #endif
@@ -496,8 +496,8 @@ std::map<HEXA_NS::Quad*, bool>  SMESH_HexaBlocks::computeQuadWays( HEXA_NS::Docu
     if(MYDEBUG) MESSAGE("INITIAL QUAD FOUND!" );
     for ( int j=0 ; j < 4 ; ++j ){
       e = q->getEdge(j);
-      if  ( (e_0 == e->getVertex(0)) and (e_1 == e->getVertex(1)) or 
-            (e_0 == e->getVertex(1)) and (e_1 == e->getVertex(0)) ){
+      if  (    ((e_0 == e->getVertex(0)) && (e_1 == e->getVertex(1)))
+            || ((e_0 == e->getVertex(1)) && (e_1 == e->getVertex(0))) ){
         break;
       }
     }
-- 
2.39.2