Commit 57f4ed4d authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Enable C++11

By checking a couple basic features.
Also fix warnings that this introduced
parent c1231278
...@@ -57,7 +57,7 @@ void ...@@ -57,7 +57,7 @@ void
Media::setVideoLockCallback( void* callback ) Media::setVideoLockCallback( void* callback )
{ {
char param[64]; char param[64];
sprintf( param, ":sout-smem-video-prerender-callback=%"PRIdPTR, (intptr_t)callback ); sprintf( param, ":sout-smem-video-prerender-callback=%" PRIdPTR, (intptr_t)callback );
addOption(param); addOption(param);
} }
...@@ -65,7 +65,7 @@ void ...@@ -65,7 +65,7 @@ void
Media::setVideoUnlockCallback( void* callback ) Media::setVideoUnlockCallback( void* callback )
{ {
char param[64]; char param[64];
sprintf( param, ":sout-smem-video-postrender-callback=%"PRIdPTR, (intptr_t)callback ); sprintf( param, ":sout-smem-video-postrender-callback=%" PRIdPTR, (intptr_t)callback );
addOption( param ); addOption( param );
} }
...@@ -73,7 +73,7 @@ void ...@@ -73,7 +73,7 @@ void
Media::setAudioLockCallback( void* callback ) Media::setAudioLockCallback( void* callback )
{ {
char param[64]; char param[64];
sprintf( param, ":sout-smem-audio-prerender-callback=%"PRIdPTR, (intptr_t)callback ); sprintf( param, ":sout-smem-audio-prerender-callback=%" PRIdPTR, (intptr_t)callback );
addOption(param); addOption(param);
} }
...@@ -81,7 +81,7 @@ void ...@@ -81,7 +81,7 @@ void
Media::setAudioUnlockCallback( void* callback ) Media::setAudioUnlockCallback( void* callback )
{ {
char param[64]; char param[64];
sprintf( param, ":sout-smem-audio-postrender-callback=%"PRIdPTR, (intptr_t)callback ); sprintf( param, ":sout-smem-audio-postrender-callback=%" PRIdPTR, (intptr_t)callback );
addOption( param ); addOption( param );
} }
...@@ -90,7 +90,7 @@ Media::setVideoDataCtx( void* dataCtx ) ...@@ -90,7 +90,7 @@ Media::setVideoDataCtx( void* dataCtx )
{ {
char param[64]; char param[64];
sprintf( param, ":sout-smem-video-data=%"PRIdPTR, (intptr_t)dataCtx ); sprintf( param, ":sout-smem-video-data=%" PRIdPTR, (intptr_t)dataCtx );
addOption( param ); addOption( param );
} }
...@@ -99,7 +99,7 @@ Media::setAudioDataCtx( void* dataCtx ) ...@@ -99,7 +99,7 @@ Media::setAudioDataCtx( void* dataCtx )
{ {
char param[64]; char param[64];
sprintf( param, ":sout-smem-audio-data=%"PRIdPTR, (intptr_t)dataCtx ); sprintf( param, ":sout-smem-audio-data=%" PRIdPTR, (intptr_t)dataCtx );
addOption( param ); addOption( param );
} }
......
...@@ -269,6 +269,10 @@ ADD_CUSTOM_COMMAND( ...@@ -269,6 +269,10 @@ ADD_CUSTOM_COMMAND(
ADD_DEFINITIONS( -W -Wall -Wextra ) ADD_DEFINITIONS( -W -Wall -Wextra )
# Ensure we can use some C++11 features
target_compile_features(vlmc PUBLIC cxx_nullptr cxx_range_for)
IF(UNIX) IF(UNIX)
IF (WITH_PROFILING) IF (WITH_PROFILING)
ADD_DEFINITIONS( -pg ) ADD_DEFINITIONS( -pg )
......
Markdown is supported
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