added -DCOMPILING_DPLYR in Makevars so that we don't have to define i…

…t in every .cpp file
mikeaddison93 · Feb 12, 2014 · f66874c · f66874c
1 parent ec981ac
commit f66874c
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 6 deletions.
diff --git a/src/Makevars b/src/Makevars
@@ -1 +1 @@
-PKG_CPPFLAGS+=-I../inst/include/
+PKG_CPPFLAGS+=-I../inst/include/ -DCOMPILING_DPLYR
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1 +1 @@
-PKG_CPPFLAGS+=-I../inst/include/
+PKG_CPPFLAGS+=-I../inst/include/ -DCOMPILING_DPLYR
diff --git a/src/address.cpp b/src/address.cpp
@@ -1,4 +1,3 @@
-#define COMPILING_DPLYR
 #include <Rcpp.h>
 using namespace Rcpp;
 

diff --git a/src/dplyr.cpp b/src/dplyr.cpp
@@ -1,4 +1,3 @@
-#define COMPILING_DPLYR
 #include <dplyr.h>
 
 using namespace Rcpp ;

diff --git a/src/init.cpp b/src/init.cpp
@@ -1,4 +1,3 @@
-#define COMPILING_DPLYR
 #include <Rcpp.h>
 #include <dplyr.h>
 

diff --git a/src/window.cpp b/src/window.cpp
@@ -1,4 +1,3 @@
-#define COMPILING_DPLYR
 #include <Rcpp.h>
 using namespace Rcpp;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		PKG_CPPFLAGS+=-I../inst/include/
		PKG_CPPFLAGS+=-I../inst/include/ -DCOMPILING_DPLYR