Resolve some warnings from GCC for CRAN

wenjie2wang · Jul 8, 2024 · eae04ff · eae04ff
1 parent 7347684
commit eae04ff
Show file tree

Hide file tree

Showing 28 changed files with 69 additions and 41 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,34 +1,41 @@
+2024-07-07 Wenjie Wang <wang@wwenjie.org>
+
+	* Fixed CRAN warning: "template-id not allowed for constructor in
+	C++20".
+
+	* Changed package version to 0.4-7.
+
 2023-11-27 Wenjie Wang <wang@wwenjie.org>
 
 	* Fixed CRAN warning: "GibbsSampler.h:91:27: warning: format ‘%d’
-	expects argument of type ‘int’, but argument 2 has type ‘Size’"
+	expects argument of type ‘int’, but argument 2 has type ‘Size’".
 
-	* Changed package version to 0.4-6
+	* Changed package version to 0.4-6.
 
 2023-08-19 Wenjie Wang <wang@wwenjie.org>
 
 	* Fixed broken roxygen2 documentation.
 
-	* Changed package version to 0.4-5
+	* Changed package version to 0.4-5.
 
 2023-04-28 Wenjie Wang <wang@wwenjie.org>
 
 	* Fixed CRAN warning: "a function declaration without a
 	prototype is deprecated in all versions of C [-Wstrict-prototypes]".
 
-	* Changed package version to 0.4-4
+	* Changed package version to 0.4-4.
 
 2022-02-15 Wenjie Wang <wang@wwenjie.org>
 
 	* Fixed `coef` method for `splineCox`
 
-	* Changed package version to 0.4-3
+	* Changed package version to 0.4-3.
 
 2020-09-05 Wenjie Wang <wang@wwenjie.org>
 
 	* Removed checks of examples to pass CRAN checks on Soloris.
 
-	* Changed package version to 0.4-2
+	* Changed package version to 0.4-2.
 
 2020-08-23 Wenjie Wang <wang@wwenjie.org>
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: dynsurv
 Title: Dynamic Models for Survival Data
-Version: 0.4-6
+Version: 0.4-7
 Authors@R: c(
     person(given = "Wenjie", family = "Wang",
            email = "wang@wwenjie.org",
@@ -41,4 +41,4 @@ NeedsCompilation: yes
 Encoding: UTF-8
 URL: https://github.com/wenjie2wang/dynsurv
 BugReports: https://github.com/wenjie2wang/dynsurv/issues
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.2
diff --git a/R/bayesCox.R b/R/bayesCox.R
@@ -1,6 +1,6 @@
 ##
 ## R package dynsurv by Wenjie Wang, Ming-Hui Chen, Xiaojing Wang, and Jun Yan
-## Copyright (C) 2011-2023
+## Copyright (C) 2011-2024
 ##
 ## This file is part of the R package dynsurv.
 ##

diff --git a/R/bayesCoxMcmc.R b/R/bayesCoxMcmc.R
@@ -1,6 +1,6 @@
 ##
 ## R package dynsurv by Wenjie Wang, Ming-Hui Chen, Xiaojing Wang, and Jun Yan
-## Copyright (C) 2011-2023
+## Copyright (C) 2011-2024
 ##
 ## This file is part of the R package dynsurv.
 ##

diff --git a/R/coef.R b/R/coef.R
@@ -1,6 +1,6 @@
 ##
 ## R package dynsurv by Wenjie Wang, Ming-Hui Chen, Xiaojing Wang, and Jun Yan
-## Copyright (C) 2011-2023
+## Copyright (C) 2011-2024
 ##
 ## This file is part of the R package dynsurv.
 ##

diff --git a/R/data.R b/R/data.R
@@ -1,6 +1,6 @@
 ##
 ## R package dynsurv by Wenjie Wang, Ming-Hui Chen, Xiaojing Wang, and Jun Yan
-## Copyright (C) 2011-2023
+## Copyright (C) 2011-2024
 ##
 ## This file is part of the R package dynsurv.
 ##

diff --git a/R/dynsurv-package.R b/R/dynsurv-package.R
@@ -1,6 +1,6 @@
 ##
 ## R package dynsurv by Wenjie Wang, Ming-Hui Chen, Xiaojing Wang, and Jun Yan
-## Copyright (C) 2011-2023
+## Copyright (C) 2011-2024
 ##
 ## This file is part of the R package dynsurv.
 ##
@@ -29,8 +29,9 @@
 ##'     data using estimating equations.
 ##' }
 ##'
-##' @docType package
+##' @useDynLib dynsurv
+##'
 ##' @name dynsurv
 ##' @aliases dynsurv-package
-##' @useDynLib dynsurv
-NULL
+##' @keywords internal
+"_PACKAGE"
diff --git a/R/jump.R b/R/jump.R
@@ -1,6 +1,6 @@
 ##
 ## R package dynsurv by Wenjie Wang, Ming-Hui Chen, Xiaojing Wang, and Jun Yan
-## Copyright (C) 2011-2023
+## Copyright (C) 2011-2024
 ##
 ## This file is part of the R package dynsurv.
 ##

diff --git a/R/misc.R b/R/misc.R
@@ -1,6 +1,6 @@
 ##
 ## R package dynsurv by Wenjie Wang, Ming-Hui Chen, Xiaojing Wang, and Jun Yan
-## Copyright (C) 2011-2023
+## Copyright (C) 2011-2024
 ##
 ## This file is part of the R package dynsurv.
 ##

diff --git a/R/plot.R b/R/plot.R
@@ -1,6 +1,6 @@
 ##
 ## R package dynsurv by Wenjie Wang, Ming-Hui Chen, Xiaojing Wang, and Jun Yan
-## Copyright (C) 2011-2023
+## Copyright (C) 2011-2024
 ##
 ## This file is part of the R package dynsurv.
 ##

diff --git a/R/print.R b/R/print.R
@@ -1,6 +1,6 @@
 ##
 ## R package dynsurv by Wenjie Wang, Ming-Hui Chen, Xiaojing Wang, and Jun Yan
-## Copyright (C) 2011-2023
+## Copyright (C) 2011-2024
 ##
 ## This file is part of the R package dynsurv.
 ##

diff --git a/R/reexports.R b/R/reexports.R
@@ -1,6 +1,6 @@
 ##
 ## R package dynsurv by Wenjie Wang, Ming-Hui Chen, Xiaojing Wang, and Jun Yan
-## Copyright (C) 2011-2023
+## Copyright (C) 2011-2024
 ##
 ## This file is part of the R package dynsurv.
 ##

diff --git a/R/splineCox.R b/R/splineCox.R
@@ -1,6 +1,6 @@
 ##
 ## R package dynsurv by Wenjie Wang, Ming-Hui Chen, Xiaojing Wang, and Jun Yan
-## Copyright (C) 2011-2023
+## Copyright (C) 2011-2024
 ##
 ## This file is part of the R package dynsurv.
 ##

diff --git a/R/survCurv.R b/R/survCurv.R
@@ -1,6 +1,6 @@
 ##
 ## R package dynsurv by Wenjie Wang, Ming-Hui Chen, Xiaojing Wang, and Jun Yan
-## Copyright (C) 2011-2023
+## Copyright (C) 2011-2024
 ##
 ## This file is part of the R package dynsurv.
 ##

diff --git a/R/tvTran.R b/R/tvTran.R
@@ -1,6 +1,6 @@
 ##
 ## R package dynsurv by Wenjie Wang, Ming-Hui Chen, Xiaojing Wang, and Jun Yan
-## Copyright (C) 2011-2023
+## Copyright (C) 2011-2024
 ##
 ## This file is part of the R package dynsurv.
 ##

diff --git a/inst/CITATION b/inst/CITATION
@@ -6,7 +6,7 @@ bibentry(
                as.person("Ming-Hui Chen"),
                as.person("Xiaojing Wang"),
                as.person("Jun Yan")),
-    year = "2023",
+    year = "2024",
     url = "https://CRAN.R-project.org/package=dynsurv",
-    note = "{R} package version 0.4-6"
+    note = "{R} package version 0.4-7"
 )
diff --git a/man/dynsurv.Rd b/man/dynsurv.Rd
diff --git a/misc/copyright.R b/misc/copyright.R
@@ -1,6 +1,6 @@
 ##
 ## R package dynsurv by Wenjie Wang, Ming-Hui Chen, Xiaojing Wang, and Jun Yan
-## Copyright (C) 2011-2023
+## Copyright (C) 2011-2024
 ##
 ## This file is part of the R package dynsurv.
 ##

diff --git a/src/CoxModel.h b/src/CoxModel.h
@@ -23,7 +23,7 @@ namespace ir {
     class CoxModel: virtual public IntRegModel<Prior, Par>
     {
     public :
-      CoxModel<Prior, Par>(const boost::shared_ptr<IntRegData>& pd)
+      CoxModel(const boost::shared_ptr<IntRegData>& pd)
         : IntRegModel<Prior, Par>(pd) {}
 
       typedef typename Prior::BasePrior_type BasePrior_type;

diff --git a/src/DynamicCoxModel.h b/src/DynamicCoxModel.h
@@ -27,7 +27,7 @@ class DynamicCoxModel:
   public CoxModel<Prior, DynamicCoxPar>
 {
 public :
-  DynamicCoxModel<Prior>(const boost::shared_ptr<IntRegData>& pd)
+  DynamicCoxModel(const boost::shared_ptr<IntRegData>& pd)
     : IntRegModel<Prior, DynamicCoxPar>(pd),
       DynamicModel<Prior, DynamicCoxPar>(pd),
       CoxModel<Prior, DynamicCoxPar>(pd) {}

diff --git a/src/DynamicCoxModel_v2.h b/src/DynamicCoxModel_v2.h
@@ -23,7 +23,7 @@ class DynamicCoxModel_v2:
   public DynamicCoxModel<Prior>
 {
 public :
-  DynamicCoxModel_v2<Prior>(const boost::shared_ptr<IntRegData>& pd)
+  DynamicCoxModel_v2(const boost::shared_ptr<IntRegData>& pd)
     : IntRegModel<Prior, DynamicCoxPar>(pd),
       DynamicCoxModel<Prior>(pd) {}
 

diff --git a/src/DynamicModel.h b/src/DynamicModel.h
@@ -25,7 +25,7 @@ namespace ir {
     {
     public :
       /* Class constructor */
-      DynamicModel<Prior, Par>(const boost::shared_ptr<IntRegData>& pd)
+      DynamicModel(const boost::shared_ptr<IntRegData>& pd)
         : IntRegModel<Prior, Par>(pd),
         a0_  (100.0),
         prob_(2, 0.35),

diff --git a/src/IntRegModel.h b/src/IntRegModel.h
@@ -25,7 +25,7 @@ template <typename Prior, typename Par>
 class IntRegModel
 {
 public:
-  IntRegModel<Prior, Par>(const boost::shared_ptr<IntRegData>& pd);
+  IntRegModel(const boost::shared_ptr<IntRegData>& pd);
 
   //~IntRegModel() {};
 

diff --git a/src/IntRegPrior.h b/src/IntRegPrior.h
@@ -143,8 +143,8 @@ namespace ir {
 template <typename BasePrior, typename CoefPrior>
 struct CoxPrior
 {
-  CoxPrior<BasePrior, CoefPrior>(const BasePrior& bp,
-                                 const CoefPrior& cp)
+  CoxPrior(const BasePrior& bp,
+           const CoefPrior& cp)
     : base_prior(bp),
       coef_prior(cp) {}
 
@@ -158,9 +158,9 @@ struct CoxPrior
 template <typename BasePrior, typename CoefPrior, typename ThetaPrior>
 struct GORHPrior
 {
-  GORHPrior<BasePrior, CoefPrior, ThetaPrior>(const BasePrior& bp,
-      const CoefPrior& cp,
-      const ThetaPrior& tp)
+  GORHPrior(const BasePrior& bp,
+            const CoefPrior& cp,
+            const ThetaPrior& tp)
     : base_prior(bp),
       coef_prior(cp),
       theta_prior(tp) {}

diff --git a/src/TimeIndepCoxModel.h b/src/TimeIndepCoxModel.h
@@ -27,7 +27,7 @@ class TimeIndepCoxModel:
   public CoxModel<Prior, TimeIndepCoxPar>
 {
 public :
-  TimeIndepCoxModel<Prior>(const boost::shared_ptr<IntRegData>& pd)
+  TimeIndepCoxModel(const boost::shared_ptr<IntRegData>& pd)
     : IntRegModel<Prior, TimeIndepCoxPar>(pd),
       TimeIndepModel<Prior, TimeIndepCoxPar>(pd),
       CoxModel<Prior, TimeIndepCoxPar>(pd) {}

diff --git a/src/TimeIndepModel.h b/src/TimeIndepModel.h
@@ -23,7 +23,7 @@ template <typename Prior, typename Par>
 class TimeIndepModel: virtual public IntRegModel<Prior, Par>
 {
 public :
-  TimeIndepModel<Prior, Par>(const boost::shared_ptr<IntRegData>& pd)
+  TimeIndepModel(const boost::shared_ptr<IntRegData>& pd)
     : IntRegModel<Prior, Par>(pd) {}
 
 protected :

diff --git a/src/TimeVaryingCoxModel.h b/src/TimeVaryingCoxModel.h
@@ -27,7 +27,7 @@ class TimeVaryingCoxModel:
   public CoxModel<Prior, TimeVaryingCoxPar>
 {
 public :
-  TimeVaryingCoxModel<Prior>(const boost::shared_ptr<IntRegData>& pd)
+  TimeVaryingCoxModel(const boost::shared_ptr<IntRegData>& pd)
     : IntRegModel<Prior, TimeVaryingCoxPar>(pd),
       TimeVaryingModel<Prior, TimeVaryingCoxPar>(pd),
       CoxModel<Prior, TimeVaryingCoxPar>(pd) {}

diff --git a/src/TimeVaryingModel.h b/src/TimeVaryingModel.h
@@ -24,7 +24,7 @@ template <typename Prior, typename Par>
 class TimeVaryingModel: virtual public IntRegModel<Prior, Par>
 {
 public :
-  TimeVaryingModel<Prior, Par>(const boost::shared_ptr<IntRegData>& pd)
+  TimeVaryingModel(const boost::shared_ptr<IntRegData>& pd)
     : IntRegModel<Prior, Par>(pd),
       a0_(100.0) {}