Merge branch 'noExecption'

nolanlab · Sep 21, 2013 · 0f8d613 · 0f8d613
2 parents b3890ff + 7fa7e41
commit 0f8d613
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/inst/include/Rclusterpp.h b/inst/include/Rclusterpp.h
@@ -1,6 +1,9 @@
 #ifndef RCLUSTERPP_H
 #define RCLUSTERPP_H
 
+#include <RcppCommon.h>
+
+
 #define EIGEN_MATRIXBASE_PLUGIN <RclusterppEigenMatrixPlugin.h>
 #define EIGEN_ARRAYBASE_PLUGIN <RclusterppEigenArrayPlugin.h>
 #include <RcppEigenForward.h>

diff --git a/inst/include/RclusterppForward.h b/inst/include/RclusterppForward.h
@@ -1,8 +1,6 @@
 #ifndef RCLUSTERPPFORWARD_H
 #define RCLUSTERPPFORWARD_H
 
-#include <Rclusterpp.h>
-
 namespace Rclusterpp {
 
 	enum LinkageKinds {