Fix the moc issue of scene_edit_polyhedron_item

- Fix the ODR for Scene_edit_polyhedron_item.h: add inline
- Re-activate the automoc for scene_edit_polyhedron_item
This commit is contained in:
Laurent Rineau 2015-03-31 15:25:10 +02:00
parent 3912980086
commit cc3ad751a8
2 changed files with 4 additions and 2 deletions

View File

@ -433,7 +433,7 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
target_link_libraries(corefinement_plugin scene_polyhedron_item scene_combinatorial_map_item scene_polylines_item)
polyhedron_demo_plugin(trivial_plugin Polyhedron_demo_trivial_plugin)
Set(CMAKE_AUTOMOC OFF)
# Edit polyhedron scene item and plugin
if ( EIGEN3_FOUND AND "${EIGEN3_VERSION}" VERSION_GREATER "3.1.90" )
qt5_wrap_ui( editionUI_FILES Deform_mesh.ui )
@ -448,7 +448,7 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
else()
message(STATUS "NOTICE: The polyhedron edit plugin require Eigen 3.2 (or higher) and will not be available.")
endif()
Set(CMAKE_AUTOMOC ON)
polyhedron_demo_plugin(cut_plugin Polyhedron_demo_cut_plugin)
target_link_libraries(cut_plugin scene_polyhedron_item scene_basic_objects)

View File

@ -41,12 +41,14 @@ public:
};
inline
Array_based_vertex_point_map::value_type
get(Array_based_vertex_point_map,
Array_based_vertex_point_map::key_type key) {
return key->point();
}
inline
void
put(Array_based_vertex_point_map pmap,
Array_based_vertex_point_map::key_type key,