Merge branch 'develop' of cgogn:~untereiner/CGoGN into develop

apps_cmake.txt

@@ -112,7 +112,7 @@ IF(WIN32)
 	set(CMAKE_CONFIGURATION_TYPES Release Debug)
 	set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Only Release or Debug" FORCE)
 ELSE(WIN32)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fPIC")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fPIC -std=c++11")
 ENDIF(WIN32)
 
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin)

include/Topology/map/embeddedMap2_MR.h

@@ -22,8 +22,8 @@
 *                                                                              *
 *******************************************************************************/
 
-#ifndef __EMBEDDED_MAP2_H__
-#define __EMBEDDED_MAP2_H__
+#ifndef __EMBEDDED_MAP2_MR_H__
+#define __EMBEDDED_MAP2_MR_H__
 
 #include "Topology/map/map2.h"
 #include "Topology/generic/mapImpl/mapMulti.h"