summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-07-14 09:00:05 +0200
committerStanislaw Halik <sthalik@misaki.pl>2018-07-14 09:00:55 +0200
commit88103dd3dd5a8bdd70958eea9eac65973941aa87 (patch)
tree4dace2e89dc44c925cb2a0c63344c0203aedd54d
parent54d5a27c7d89688afe09a7e383001586ac742846 (diff)
fix build
-rw-r--r--compat/timer.cpp1
-rw-r--r--logic/work.cpp2
-rw-r--r--options/metatype.cpp2
-rw-r--r--options/metatype.hpp14
4 files changed, 10 insertions, 9 deletions
diff --git a/compat/timer.cpp b/compat/timer.cpp
index b9664263..dcf3f430 100644
--- a/compat/timer.cpp
+++ b/compat/timer.cpp
@@ -120,6 +120,7 @@ void Timer::gettime(timespec* state)
otr_clock_gettime(state);
#elif defined CLOCK_MONOTONIC
const int res = clock_gettime(CLOCK_MONOTONIC, state);
+ (void)res;
assert(res == 0 && "must support CLOCK_MONOTONIC");
#else
# error "timer query method not known"
diff --git a/logic/work.cpp b/logic/work.cpp
index 14d628a7..c70864ae 100644
--- a/logic/work.cpp
+++ b/logic/work.cpp
@@ -43,7 +43,7 @@ std::unique_ptr<TrackLogger> Work::make_logger(main_settings &s)
}
else
{
- auto logger = std::make_unique<TrackLoggerCSV>(s.tracklogging_filename);
+ auto logger = std::make_unique<TrackLoggerCSV>(*s.tracklogging_filename);
if (!logger->is_open())
{
diff --git a/options/metatype.cpp b/options/metatype.cpp
index 1d13cbdd..b6df94ca 100644
--- a/options/metatype.cpp
+++ b/options/metatype.cpp
@@ -23,7 +23,7 @@ int declare_metatype_for_type(const char* str)
class sym { \
static const int dribble; \
} sym ## _singleton; \
- const int sym :: dribble = ::options::detail::declare_metatype_for_type<t>(#t)
+ const int sym :: dribble = ::options::detail::declare_metatype_for_type<t>(#t);
#define OPENTRACK_DEFINE_METATYPE(t) OPENTRACK_DEFINE_METATYPE2(t, __COUNTER__)
diff --git a/options/metatype.hpp b/options/metatype.hpp
index 3f92e09f..bf149200 100644
--- a/options/metatype.hpp
+++ b/options/metatype.hpp
@@ -16,10 +16,10 @@
# define OPENTRACK_METATYPE(x) Q_DECLARE_METATYPE(x) OPENTRACK_METATYPE_(x)
#endif
-OPENTRACK_METATYPE(QList<double>);
-OPENTRACK_METATYPE(QList<float>);
-OPENTRACK_METATYPE(QList<int>);
-OPENTRACK_METATYPE(QList<bool>);
-OPENTRACK_METATYPE(QList<QString>);
-OPENTRACK_METATYPE(QList<QPointF>);
-OPENTRACK_METATYPE(::options::slider_value);
+OPENTRACK_METATYPE(QList<double>)
+OPENTRACK_METATYPE(QList<float>)
+OPENTRACK_METATYPE(QList<int>)
+OPENTRACK_METATYPE(QList<bool>)
+OPENTRACK_METATYPE(QList<QString>)
+OPENTRACK_METATYPE(QList<QPointF>)
+OPENTRACK_METATYPE(::options::slider_value)