Skip to content

Commit 8df8741

Browse files
committed
Merge pull request #123 from RcppCore/solaris
Merging Solaris branch
2 parents 4d00229 + 4089600 commit 8df8741

32 files changed

+838
-1306
lines changed

inst/include/Rcpp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Rcpp.h: R/C++ interface class library
44
//
55
// Copyright (C) 2008 - 2009 Dirk Eddelbuettel
6-
// Copyright (C) 2009 - 2013 Dirk Eddelbuettel and Romain Francois
6+
// Copyright (C) 2009 - 2014 Dirk Eddelbuettel and Romain Francois
77
//
88
// This file is part of Rcpp.
99
//
@@ -76,6 +76,6 @@
7676
// 'see' all versions of wrap
7777
#include <Rcpp/internal/wrap_end.h>
7878

79+
#include <Rcpp/platform/solaris.h>
7980
#include <Rcpp/api/meat/meat.h>
80-
8181
#endif

inst/include/Rcpp/api/meat/AttributeProxy.h

Lines changed: 0 additions & 44 deletions
This file was deleted.

inst/include/Rcpp/api/meat/DottedPairProxy.h

Lines changed: 0 additions & 50 deletions
This file was deleted.

inst/include/Rcpp/api/meat/EnvironmentBinding.h

Lines changed: 0 additions & 44 deletions
This file was deleted.

inst/include/Rcpp/api/meat/FieldProxy.h

Lines changed: 0 additions & 44 deletions
This file was deleted.

inst/include/Rcpp/api/meat/Matrix.h

Lines changed: 0 additions & 174 deletions
This file was deleted.

0 commit comments

Comments
 (0)