From 21cac744a6d6ca59f686ac332b531e5be65cc3af Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 18 Nov 2016 21:00:31 +0100 Subject: pose-widget: avoid impl namespace clash --- pose-widget/glwidget.cpp | 2 +- pose-widget/glwidget.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pose-widget/glwidget.cpp b/pose-widget/glwidget.cpp index 01a6b74b..023e1926 100644 --- a/pose-widget/glwidget.cpp +++ b/pose-widget/glwidget.cpp @@ -15,7 +15,7 @@ #include using namespace euler; -using namespace impl; +using namespace pose_widget_impl; GLWidget::GLWidget(QWidget *parent) : QWidget(parent) { diff --git a/pose-widget/glwidget.h b/pose-widget/glwidget.h index f98b4628..ae06e5c5 100644 --- a/pose-widget/glwidget.h +++ b/pose-widget/glwidget.h @@ -19,7 +19,7 @@ # define POSE_WIDGET_EXPORT Q_DECL_IMPORT #endif -namespace impl { +namespace pose_widget_impl { using num = float; using vec3 = Mat; @@ -52,4 +52,4 @@ private: } -using impl::GLWidget; +using pose_widget_impl::GLWidget; -- cgit v1.2.3