Commit d6225898 authored by julien.waechter's avatar julien.waechter
Browse files

Updated fwData for C++11 compatibility

--HG--
branch : fw4spl_0.10.1
parent 69474547
......@@ -61,15 +61,13 @@ set(SPYLOG_LEVEL_MAP_debug 5)
set(SPYLOG_LEVEL_MAP_trace 6)
set_property(CACHE SPYLOG_LEVEL PROPERTY STRINGS ${SPYLOG_LEVEL_VALUES} )
# Until c++11 beeing globaly enabled ...
macro(fwEnableCpp11)
if(NOT WIN32)
add_definitions("--std=c++11")
if(APPLE)
add_definitions("--stdlib=libc++")
endif(APPLE)
endif()
endmacro()
# Globaly enabled c++11
if(NOT WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --stdlib=libc++")
endif(APPLE)
endif()
macro(initProject PRJNAME )
if(CREATE_SUBPROJECTS)
......
......@@ -129,7 +129,7 @@ size_t Image::allocate() throw(::fwData::Exception)
size_t Image::allocate(SizeType::value_type x, SizeType::value_type y, SizeType::value_type z,
const ::fwTools::Type &type, size_t numberOfComponents) throw(::fwData::Exception)
{
m_size = boost::assign::list_of(x)(y)(z);
m_size = { x, y, z};
m_type = type;
m_attrNumberOfComponents = numberOfComponents;
return allocate();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment