From 903c08bc4dea9615464869c5e8ba08d1125f2509 Mon Sep 17 00:00:00 2001
From: "Samuel Watson (Applied Health Research) (ID=*****27)"
 <s.i.watson@bham.ac.uk>
Date: Mon, 8 Apr 2024 18:01:01 +0100
Subject: [PATCH] v0.8.1 Makevars fix

---
 man/formula.Model.Rd | 4 ++--
 man/formula.mcml.Rd  | 7 ++-----
 src/Makevars         | 2 +-
 src/Makevars.win     | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/man/formula.Model.Rd b/man/formula.Model.Rd
index 5716780..62459f7 100644
--- a/man/formula.Model.Rd
+++ b/man/formula.Model.Rd
@@ -4,10 +4,10 @@
 \alias{formula.Model}
 \title{Extracts the formula from a `Model` object}
 \usage{
-\method{formula}{Model}(object, ...)
+\method{formula}{Model}(x, ...)
 }
 \arguments{
-\item{object}{A `Model` object.}
+\item{x}{A `Model` object.}
 
 \item{...}{Further arguments passed from other methods}
 }
diff --git a/man/formula.mcml.Rd b/man/formula.mcml.Rd
index 7d3b63a..7fc139d 100644
--- a/man/formula.mcml.Rd
+++ b/man/formula.mcml.Rd
@@ -4,13 +4,10 @@
 \alias{formula.mcml}
 \title{Extracts the formula from a `mcml` object.}
 \usage{
-\method{formula}{mcml}(object, fixed = TRUE, ...)
+\method{formula}{mcml}(x, ...)
 }
 \arguments{
-\item{object}{A `mcml` object.}
-
-\item{fixed}{Logical. If TRUE the formula for the fixed effects is returned, otherwise the formula
-for the random effects is returned.}
+\item{x}{A `mcml` object.}
 
 \item{...}{Further arguments passed from other methods}
 }
diff --git a/src/Makevars b/src/Makevars
index 4d05ae7..09bd7c9 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -2,7 +2,7 @@ CXX_STD = CXX17
 
 STANHEADERS_SRC = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "message()" -e "cat(system.file('include', 'src', package = 'StanHeaders', mustWork = TRUE))" -e "message()" | grep "StanHeaders")
 
-STANC_FLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "cat(ifelse(utils::packageVersion('rstan') >= 2.26, '-DUSE_STANC3',''))")
+STANC_FLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "cat(ifelse(utils::packageVersion('rstan') >= '2.26', '-DUSE_STANC3',''))")
 PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DRCPP_PARALLEL_USE_TBB=1 $(STANC_FLAGS) -D_HAS_AUTO_PTR_ETC=0 
 PKG_CXXFLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::CxxFlags()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::CxxFlags()")
 PKG_LIBS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::RcppParallelLibs()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::LdFlags()") $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
diff --git a/src/Makevars.win b/src/Makevars.win
index ec5735b..45a9fb4 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -1,7 +1,7 @@
 STANHEADERS_SRC = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "message()" -e "cat(system.file('include', 'src', package = 'StanHeaders', mustWork = TRUE))" -e "message()" | grep "StanHeaders")
 
 STANC_FLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "cat(ifelse(utils::packageVersion('rstan') >= '2.26', '-DUSE_STANC3',''))") 
-PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DRCPP_PARALLEL_USE_TBB=1 $(STANC_FLAGS) -D_HAS_AUTO_PTR_ETC=0
+PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DRCPP_PARALLEL_USE_TBB=1 $(STANC_FLAGS) -D_HAS_AUTO_PTR_ETC=0 
 PKG_CXXFLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::CxxFlags()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::CxxFlags()") 
 PKG_LIBS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::RcppParallelLibs()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::LdFlags()")