summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-11-18 21:00:31 +0100
committerStanislaw Halik <sthalik@misaki.pl>2016-11-18 21:00:31 +0100
commit21cac744a6d6ca59f686ac332b531e5be65cc3af (patch)
tree203bbcd9e35786e0044f9a3c244a92bcb893ed26
parent322a6f008627f6beb389ea47c7a2c8d4f02a6261 (diff)
pose-widget: avoid impl namespace clash
-rw-r--r--pose-widget/glwidget.cpp2
-rw-r--r--pose-widget/glwidget.h4
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 <QDebug>
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<num, 3, 1>;
@@ -52,4 +52,4 @@ private:
}
-using impl::GLWidget;
+using pose_widget_impl::GLWidget;