Merge branch 'V9_2_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd02fc5b5aa30ff91607184085e3f1ed5ddc3923..0a3a3fc6a22b87011be4d287b57f25a6452b3f8c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 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)
 
 # Common CMake macros
 # ===================

diff --git a/src/GenericObj/SALOME_GenericObj_wrap.hxx b/src/GenericObj/SALOME_GenericObj_wrap.hxx
index be8069a9427ffce137895d55ab3fa732c7e003ab..8263a2cbda93e28ce78ace4b22b9df94ebd561fe 100644 (file)
--- a/src/GenericObj/SALOME_GenericObj_wrap.hxx
+++ b/src/GenericObj/SALOME_GenericObj_wrap.hxx
@@ -130,15 +130,15 @@ namespace SALOME
       return *this;
     }
     // ACCESS
-    operator TPtr()
+    operator TPtr() const
     {
       return _obj.in();
     }
-    operator TVar()
+    operator TVar() const
     {
       return _obj;
     }
-    TVar operator->()
+    TVar operator->() const
     {
       return _obj;
     }