Mercurial > hg > svcore
changeset 602:02d9664906e8
* Fixes to gcc-4.4 thanks to Michel Salim
| author | Chris Cannam |
|---|---|
| date | Mon, 24 Aug 2009 16:07:23 +0000 |
| parents | 5eb5449432f5 |
| children | e43368ec5ff0 |
| files | rdf/RDFFeatureWriter.cpp rdf/RDFFeatureWriter.h system/System.h |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/rdf/RDFFeatureWriter.cpp Tue Aug 18 11:08:29 2009 +0000 +++ b/rdf/RDFFeatureWriter.cpp Mon Aug 24 16:07:23 2009 +0000 @@ -319,7 +319,7 @@ // Note reviewFileForAppending above (when opening in append mode) - uint64_t signalCount = m_count++; + unsigned long signalCount = m_count++; if (m_trackSignalURIs.find(trackId) == m_trackSignalURIs.end()) { m_trackSignalURIs[trackId] = QString(":signal_%1").arg(signalCount); @@ -537,7 +537,7 @@ for (int i = 0; i < featureList.size(); ++i) { const Plugin::Feature &feature = featureList[i]; - uint64_t featureNumber = m_count++; + unsigned long featureNumber = m_count++; stream << ":event_" << featureNumber << " a "; @@ -671,7 +671,7 @@ bool plain = (m_plain || !desc.haveDescription()); QString outputId = od.identifier.c_str(); - uint64_t featureNumber = m_count++; + unsigned long featureNumber = m_count++; // need to write out feature timeline map -- for this we need // the sample rate, window length and hop size from the
--- a/rdf/RDFFeatureWriter.h Tue Aug 18 11:08:29 2009 +0000 +++ b/rdf/RDFFeatureWriter.h Mon Aug 24 16:07:23 2009 +0000 @@ -123,7 +123,7 @@ bool m_network; bool m_networkRetrieved; - uint64_t m_count; + unsigned long m_count; }; #endif
--- a/system/System.h Tue Aug 18 11:08:29 2009 +0000 +++ b/system/System.h Mon Aug 24 16:07:23 2009 +0000 @@ -62,6 +62,7 @@ #include <sys/mman.h> #include <dlfcn.h> +#include <stdio.h> // for perror #define MLOCK(a,b) ::mlock((a),(b)) #define MUNLOCK(a,b) (::munlock((a),(b)) ? (::perror("munlock failed"), 0) : 0)