From: vsr <vsr@opencascade.com>
Date: Thu, 15 Oct 2015 14:25:12 +0000 (+0300)
Subject: Enable C++0x/C++11 support
X-Git-Tag: V8_0_pre~4^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e1b51b36729c4ca18876505d816403eb31d2b4ef;p=modules%2Fkernel.git

Enable C++0x/C++11 support
---

diff --git a/salome_adm/cmake_files/SalomeSetupPlatform.cmake b/salome_adm/cmake_files/SalomeSetupPlatform.cmake
index 1548daeaf..6d8fbf1d2 100644
--- a/salome_adm/cmake_files/SalomeSetupPlatform.cmake
+++ b/salome_adm/cmake_files/SalomeSetupPlatform.cmake
@@ -165,3 +165,17 @@ IF(NOT WIN32)
     SET(CMAKE_C_FLAGS    "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
   ENDIF()
 ENDIF()
+
+# C++11 support
+INCLUDE(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+IF(COMPILER_SUPPORTS_CXX11)
+    MESSAGE(STATUS "Enable C++11 support")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ELSEIF(COMPILER_SUPPORTS_CXX0X)
+    MESSAGE(STATUS "Enable C++0x support")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+ELSE()
+    MESSAGE(WARNING "Compiler ${CMAKE_CXX_COMPILER} has no C++11 support.")
+ENDIF()
diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx
index 2bf1f0e75..cd2ccd04f 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx
@@ -1555,9 +1555,9 @@ void ReadNoteBookVariables(SALOMEDSImpl_Study* theStudy, HDFgroup* theGroup)
       SALOMEDSImpl_GenericVariable* aVariable = 
         new SALOMEDSImpl_ScalarVariable(aVarType,std::string(aVarName));
       aVariable->Load(std::string(currentVarValue));
-	  aVarsMap.insert(std::make_pair<int,SALOMEDSImpl_GenericVariable*>(order,aVariable));
+      aVarsMap.insert(std::make_pair(order,aVariable));
       delete [] currentVarValue;
-	}
+    }
   }
   
   std::map<int,SALOMEDSImpl_GenericVariable*>::const_iterator it= aVarsMap.begin();