From 9ab9d22f820831e16551f90105edaea5319c528e Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 21 Jul 2014 14:37:25 +0100
Subject: split helper and fix build

Change-Id: Ie479d363152d3c6a109d6e924b09c155c79511c8
---
 include/vcl/opengl/GLMHelper.hxx    | 24 ++++++++++++++++++++++++
 include/vcl/opengl/OpenGLHelper.hxx |  7 -------
 2 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 include/vcl/opengl/GLMHelper.hxx

(limited to 'include')

diff --git a/include/vcl/opengl/GLMHelper.hxx b/include/vcl/opengl/GLMHelper.hxx
new file mode 100644
index 000000000000..8287c3458346
--- /dev/null
+++ b/include/vcl/opengl/GLMHelper.hxx
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_VCL_GLM_GLMHELPER_HXX
+#define INCLUDED_VCL_GLM_GLMHELPER_HXX
+
+#include "glm/glm.hpp"
+#include <vcl/vclopengl_dllapi.hxx>
+
+#include <ostream>
+
+VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::mat4& rMatrix);
+VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec4& rPos);
+VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec3& rPos);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index 87a71fac5ab9..f80d34b887fb 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -11,14 +11,11 @@
 #define INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX
 
 #include <GL/glew.h>
-#include "glm/glm.hpp"
 #include <vcl/vclopengl_dllapi.hxx>
 #include <vcl/bitmapex.hxx>
 
 #include <rtl/ustring.hxx>
 
-#include <ostream>
-
 class VCLOPENGL_DLLPUBLIC OpenGLHelper
 {
 public:
@@ -41,10 +38,6 @@ public:
     static float getGLVersion();
 };
 
-VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::mat4& rMatrix);
-VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec4& rPos);
-VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec3& rPos);
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit