Mercurial > hg > sonic-visualiser

changeset 914:096634fc3f19 cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Now builds with current svcore; next, try it again with -Wconversion in svgui, svapp, and sonic-visualiser
author Chris Cannam
date Wed, 04 Mar 2015 13:53:42 +0000
parents 3c88bf74959d
children 0460b9347198
files .hgsubstate configure main/MainWindow.cpp platform-dataquay.pri version.h
diffstat 5 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Tue Mar 03 09:33:59 2015 +0000
+++ b/.hgsubstate	Wed Mar 04 13:53:42 2015 +0000
@@ -1,5 +1,5 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 879bdc878826bebec67130326f99397c430419b1 sv-dependency-builds
-720f732e8082eec24508cc87df604de4d7950d95 svapp
-bf0e5944289bb56c34e7ee545483374b0b85d5c0 svcore
-1fc4f29feb2e530c4d76430050181f5aea4157ad svgui
+dee4aceb131c3edb0d18d82db9db01287d0919ca svapp
+16dc7307d43a51709d4b7f9747754833f851a1a7 svcore
+0fe1f4407261e6cd4741bb104be48cf6bb0e782f svgui
--- a/configure	Tue Mar 03 09:33:59 2015 +0000
+++ b/configure	Wed Mar 04 13:53:42 2015 +0000
@@ -4364,9 +4364,9 @@
 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
 
 if test "x$GCC" = "xyes"; then
-        CXXFLAGS_DEBUG="-Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe"
-   	CXXFLAGS_RELEASE="-g0 -O2 -Wall -pipe"
-   	CXXFLAGS_MINIMAL="-g0 -O0"
+        CXXFLAGS_DEBUG="-std=c++11 -Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe"
+   	CXXFLAGS_RELEASE="-std=c++11 -g0 -O2 -Wall -pipe"
+   	CXXFLAGS_MINIMAL="-std=c++11 -g0 -O0"
 fi
 
 CXXFLAGS_BUILD="$CXXFLAGS_RELEASE"
--- a/main/MainWindow.cpp	Tue Mar 03 09:33:59 2015 +0000
+++ b/main/MainWindow.cpp	Wed Mar 04 13:53:42 2015 +0000
@@ -3749,8 +3749,8 @@
         }
     }
     
-    int startFrame = 0, duration = 0;
-    int endFrame = 0;
+    sv_frame_t startFrame = 0, duration = 0;
+    sv_frame_t endFrame = 0;
     m_viewManager->getSelection().getExtents(startFrame, endFrame);
     if (endFrame > startFrame) duration = endFrame - startFrame;
     else startFrame = 0;
--- a/platform-dataquay.pri	Tue Mar 03 09:33:59 2015 +0000
+++ b/platform-dataquay.pri	Wed Mar 04 13:53:42 2015 +0000
@@ -7,6 +7,7 @@
 
 DEFINES -= USE_REDLAND
 QMAKE_CXXFLAGS -= -I/usr/include/rasqal -I/usr/include/raptor2
+QMAKE_CXXFLAGS -= -Werror
 EXTRALIBS -= -lrdf
 
 DEFINES += USE_SORD
--- a/version.h	Tue Mar 03 09:33:59 2015 +0000
+++ b/version.h	Wed Mar 04 13:53:42 2015 +0000
@@ -1,1 +1,1 @@
-#define SV_VERSION "2.4"
+#define SV_VERSION "2.4.1"