Commit f3450ca9 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

vtkRAdapter: move R_NO_REMAP to the header

Rinternals.h also does silly things.
parent 1cf2f9be
...@@ -48,8 +48,6 @@ ...@@ -48,8 +48,6 @@
#include <stdio.h> #include <stdio.h>
#include <cassert> #include <cassert>
#define R_NO_REMAP /* AVOID SOME SERIOUS STUPIDITY. DO NOT REMOVE. */
#include "R.h" #include "R.h"
#include "Rdefines.h" #include "Rdefines.h"
#include "R_ext/Parse.h" #include "R_ext/Parse.h"
......
...@@ -48,6 +48,9 @@ ...@@ -48,6 +48,9 @@
#include "vtkFiltersStatisticsGnuRModule.h" // For export macro #include "vtkFiltersStatisticsGnuRModule.h" // For export macro
#include "vtkObject.h" #include "vtkObject.h"
#define R_NO_REMAP /* Don't pollute the namespace (some of which conflict). DO NOT REMOVE. */
#include "Rinternals.h" // Needed for Rinternals.h SEXP data structure #include "Rinternals.h" // Needed for Rinternals.h SEXP data structure
class vtkInformation; class vtkInformation;
...@@ -125,6 +128,3 @@ private: ...@@ -125,6 +128,3 @@ private:
#endif #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment