Mercurial > octave

diff libinterp/corefcn/gl-render.h @ 26417:4166610a41bc stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not include private file oct-opengl.h in public headers (bug #55277) * gl-render.cc (opengl_renderer::get_string): Move HAVE_OPENGL conditional inside function definition. * gl-render.h: Do not include oct-opengl.h, add forward decl of opengl_functions, delete HAVE_OPENGL conditional from public header. * gl2ps-print.h: Do not include oct-opengl.h, add forward decl of opengl_functions.
author Mike Miller <mtmiller@octave.org>
date Thu, 03 Jan 2019 14:15:08 -0800
parents 00f796120a6d
children f034b29320ad
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.h	Sun Dec 30 13:28:03 2018 -0800
+++ b/libinterp/corefcn/gl-render.h	Thu Jan 03 14:15:08 2019 -0800
@@ -26,11 +26,12 @@
 #include "octave-config.h"
 
 #include "graphics.h"
-#include "oct-opengl.h"
 #include "text-renderer.h"
 
 namespace octave
 {
+  class opengl_functions;
+
   class
   OCTINTERP_API
   opengl_renderer
@@ -168,9 +169,7 @@
 
     void init_maxlights (void);
 
-#if defined (HAVE_OPENGL)
-    std::string get_string (GLenum id) const;
-#endif
+    std::string get_string (unsigned int id) const;
 
     bool is_nan_or_inf (double x, double y, double z) const
     {