From: vsr <vsr@opencascade.com>
Date: Thu, 3 Apr 2014 10:15:51 +0000 (+0400)
Subject: Merge branch V7_3_1_BR
X-Git-Tag: V7_4_0a1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4e4b3762fc1215eb520840fe65eaeeea0854eff8;p=modules%2Fgeom.git

Merge branch V7_3_1_BR
---

4e4b3762fc1215eb520840fe65eaeeea0854eff8
diff --cc CMakeLists.txt
index 511585319,e1ebcfcde..1300477fc
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -31,10 -31,10 +31,10 @@@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
  SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
- SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
+ SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
  SET(${PROJECT_NAME_UC}_VERSION
    ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
 -SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 +SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
  
  # Find KERNEL
  # ===========
diff --cc src/GEOM_I/GEOM_Gen_i.cc
index 5a9685b5d,e844dbcab..f51456c46
--- a/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@@ -110,14 -109,13 +110,11 @@@ GEOM_Gen_i::GEOM_Gen_i(CORBA::ORB_pt
    {
      //work around PAL12004, PAL12628
      //OSD::SetSignal( true );
--    bool raiseFPE;
- #ifdef _DEBUG_
-     raiseFPE = true;
-     char* envDisableFPE = getenv("DISABLE_FPE");
-     if (envDisableFPE && atoi(envDisableFPE))
-       raiseFPE = false;
- #else
-     raiseFPE = false;
++    bool raiseFPE = false;
+ #if defined(_DEBUG_) | defined(_DEBUG) //the Last for WIN32 default settings
 -  char* envEnableFPE = getenv("ENABLE_FPE");
 -  if (envEnableFPE && atoi(envEnableFPE))
 -    raiseFPE = true;
 -#else
 -    raiseFPE = false;
++    char* envEnableFPE = getenv("ENABLE_FPE");
++    if (envEnableFPE && atoi(envEnableFPE))
++      raiseFPE = true;
  #endif
      OSD::SetSignal( raiseFPE );
    }