Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
VTK
VTK
Commits
2166c067
Commit
2166c067
authored
Jul 20, 2015
by
Ben Boeckel
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FiltersStatisticsGnuR: fix R_NO_REMAP juggling
parent
71ab7e7b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
0 deletions
+6
-0
Filters/StatisticsGnuR/CMakeLists.txt
Filters/StatisticsGnuR/CMakeLists.txt
+2
-0
Filters/StatisticsGnuR/vtkRAdapter.cxx
Filters/StatisticsGnuR/vtkRAdapter.cxx
+2
-0
Filters/StatisticsGnuR/vtkRAdapter.h
Filters/StatisticsGnuR/vtkRAdapter.h
+2
-0
No files found.
Filters/StatisticsGnuR/CMakeLists.txt
View file @
2166c067
...
...
@@ -14,6 +14,8 @@ set(Module_SRCS
find_package
(
R
)
include_directories
(
${
R_INCLUDE_DIR
}
)
add_definitions
(
-DVTK_BUILDING_FILTERS_STATISTICSGNUR
)
# Configure the module specific settings into a module configured header.
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/vtkFiltersStatisticsGnuRConfigure.h.in
${
CMAKE_CURRENT_BINARY_DIR
}
/vtkFiltersStatisticsGnuRConfigure.h
)
...
...
Filters/StatisticsGnuR/vtkRAdapter.cxx
View file @
2166c067
...
...
@@ -48,6 +48,8 @@
#include <stdio.h>
#include <cassert>
#define R_NO_REMAP
/* AVOID SOME SERIOUS STUPIDITY. DO NOT REMOVE. */
#include "R.h"
#include "Rdefines.h"
#include "R_ext/Parse.h"
...
...
Filters/StatisticsGnuR/vtkRAdapter.h
View file @
2166c067
...
...
@@ -49,7 +49,9 @@
#include "vtkFiltersStatisticsGnuRModule.h" // For export macro
#include "vtkObject.h"
#ifndef VTK_BUILDING_FILTERS_STATISTICSGNUR
#define R_NO_REMAP
/* Don't pollute the namespace (some of which conflict). DO NOT REMOVE. */
#endif
#include "Rinternals.h" // Needed for Rinternals.h SEXP data structure
...
...
Ben Boeckel
@ben.boeckel
mentioned in commit
51c49664
·
Jul 20, 2015
mentioned in commit
51c49664
mentioned in commit 51c49664171e8f8806e07d6107ea01231993fbb5
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment