From 55ae816970d17d524ac9507d9d11a8d56700e916 Mon Sep 17 00:00:00 2001 From: Duncan Murdoch Date: Tue, 4 Jul 2023 07:39:20 -0400 Subject: [PATCH] Rearrange header order Fix src/useNULL/Makevars.in --- DESCRIPTION | 2 +- NEWS.md | 8 +++++--- cran-comments.md | 5 +++++ src/Makevars.in | 2 +- src/Makevars.win.in | 2 +- src/NULLgui.cpp | 2 +- src/api.cpp | 2 +- src/api.h | 4 ++-- src/callbacks.cpp | 4 +--- src/init.cpp | 4 ++-- src/init.h | 1 - src/par3d.cpp | 1 - src/useNULL/Makevars.in | 2 +- src/win32gui.cpp | 2 +- src/x11gui.cpp | 2 +- 15 files changed, 23 insertions(+), 20 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 28b44b475..84b5a2ac1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: rgl -Version: 1.2.0 +Version: 1.2.1 Title: 3D Visualization Using OpenGL Authors@R: c(person("Duncan", "Murdoch", role = c("aut", "cre"), email = "murdoch.duncan@gmail.com"), diff --git a/NEWS.md b/NEWS.md index c80dcc1e4..295cda406 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# rgl 1.2.0 +# rgl 1.2.1 ## Major changes @@ -41,8 +41,10 @@ properly. * `addNormals()` sometimes gave `NaN` values due to rounding error (issue #372). * `arc3d()` sometimes missed plotting the last segment of the arc (issue #369). -* `R_NO_REMAP` has been defined to prevent conflict between -R internals and C++17 library. +* `R_NO_REMAP` has been defined and header includes have been +rearranged to prevent conflict between R internals and C++17 +library. (Thanks to Prof. B. D. Ripley and G. Csardi for +suggested fixes.) # rgl 1.1.3 diff --git a/cran-comments.md b/cran-comments.md index 28f337c3e..72f03dbc0 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,3 +1,8 @@ +# 1.2.1 + +In addition to the changes below, this version rearranges header +include order. + # 1.2.0 This release is at the request of Prof Ripley, largely because of C++17 diff --git a/src/Makevars.in b/src/Makevars.in index 5bb104cf5..bce8d28f5 100644 --- a/src/Makevars.in +++ b/src/Makevars.in @@ -19,7 +19,7 @@ PKG_CFLAGS=$(C_VISIBILITY) -PKG_CPPFLAGS=-DR_NO_REMAP @NULL_CPPFLAGS@ +PKG_CPPFLAGS=@NULL_CPPFLAGS@ -DR_NO_REMAP PKG_LIBS=@NULL_LIBS@ diff --git a/src/Makevars.win.in b/src/Makevars.win.in index ce3c28337..eef9e0143 100644 --- a/src/Makevars.win.in +++ b/src/Makevars.win.in @@ -17,7 +17,7 @@ PKG_LIBS = \ @HIDE_IF_R42PLUS@ CXX_STD = CXX11 @HIDE_IF_R42PLUS@ PKG_CPPFLAGS = \ -@HIDE_IF_R42PLUS@ -DHAVE_PNG_H -DHAVE_FREETYPE -Iext -Iext/ftgl \ +@HIDE_IF_R42PLUS@ -DHAVE_PNG_H -DHAVE_FREETYPE -DR_NO_REMAP -Iext -Iext/ftgl \ @HIDE_IF_R42PLUS@ -I$(RWINLIB)/include -I$(RWINLIB)/include/freetype2 \ @HIDE_IF_R42PLUS@ -Iext/glad/include diff --git a/src/NULLgui.cpp b/src/NULLgui.cpp index 0549ccccd..e136f95da 100644 --- a/src/NULLgui.cpp +++ b/src/NULLgui.cpp @@ -1,6 +1,5 @@ #include -#include #include "config.h" // C++ source // This file is part of RGL. @@ -13,6 +12,7 @@ #include "assert.h" #include "R.h" +#include // --------------------------------------------------------------------------- diff --git a/src/api.cpp b/src/api.cpp index 4127ab673..cb44b9cd1 100644 --- a/src/api.cpp +++ b/src/api.cpp @@ -8,8 +8,8 @@ #include "lib.h" #include "R.h" -#include "api.h" #include "platform.h" +#include "api.h" using namespace rgl; // diff --git a/src/api.h b/src/api.h index 2c7cdced3..846802fac 100644 --- a/src/api.h +++ b/src/api.h @@ -1,14 +1,14 @@ #ifndef RGL_API_H #define RGL_API_H -#include "R.h" -#include #include "ABCLineSet.h" #include "PlaneSet.h" #include "SphereSet.h" #include "SpriteSet.h" #include "Surface.h" #include "TextSet.h" +#include "R.h" +#include namespace rgl { diff --git a/src/callbacks.cpp b/src/callbacks.cpp index 2346d68d1..b4e248424 100644 --- a/src/callbacks.cpp +++ b/src/callbacks.cpp @@ -1,7 +1,6 @@ -#include "api.h" #include "rglview.h" - #include "DeviceManager.h" +#include "api.h" using namespace rgl; @@ -12,7 +11,6 @@ extern DeviceManager* deviceManager; /* These defines are not in the installed version of R */ #include "R.h" -#include #include static void userControl(void *userData, int mouseX, int mouseY) diff --git a/src/init.cpp b/src/init.cpp index 448128423..821cd79a6 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -2,8 +2,6 @@ #include #include "lib.h" #include "DeviceManager.h" -#include "init.h" -#include "api.h" /* libfreetype 2.6 defines a conflicting TYPEOF macro */ @@ -14,6 +12,8 @@ #include #include #include "R.h" +#include "init.h" +#include "api.h" using namespace rgl; diff --git a/src/init.h b/src/init.h index 1f562ad7e..397c42636 100644 --- a/src/init.h +++ b/src/init.h @@ -2,7 +2,6 @@ #define RGL_INIT_H #include "R.h" -#include #include namespace rgl { diff --git a/src/par3d.cpp b/src/par3d.cpp index c9ff74d6c..e30a905f0 100644 --- a/src/par3d.cpp +++ b/src/par3d.cpp @@ -14,7 +14,6 @@ #define _ #define streql(s, t) (!strcmp((s), (t))) -#include #include namespace rgl { diff --git a/src/useNULL/Makevars.in b/src/useNULL/Makevars.in index 08fd77eef..cd1abfc75 100644 --- a/src/useNULL/Makevars.in +++ b/src/useNULL/Makevars.in @@ -7,6 +7,6 @@ @HIDE_IF_R42PLUS@ CXX_STD = CXX11 PKG_CFLAGS=$(C_VISIBILITY) -PKG_CPPFLAGS=@NULL_CPPFLAGS@ +PKG_CPPFLAGS=@NULL_CPPFLAGS@ -DR_NO_REMAP PKG_LIBS=@NULL_LIBS@ diff --git a/src/win32gui.cpp b/src/win32gui.cpp index 47d123c83..0f0776c6b 100644 --- a/src/win32gui.cpp +++ b/src/win32gui.cpp @@ -13,9 +13,9 @@ #include #include "assert.h" #include "R.h" +#include #include -#include namespace rgl { diff --git a/src/x11gui.cpp b/src/x11gui.cpp index 8a7cba055..e39175812 100644 --- a/src/x11gui.cpp +++ b/src/x11gui.cpp @@ -12,10 +12,10 @@ #include "opengl.h" #include #include -#include #include "x11gui.h" #include "lib.h" #include "R.h" +#include namespace rgl {