Skip to content

Commit 8402082

Browse files
committed
Expand comments, and displayed message when 'legacy' is used
1 parent 186f44f commit 8402082

File tree

1 file changed

+8
-4
lines changed
  • inst/include/RcppArmadillo/version

1 file changed

+8
-4
lines changed

inst/include/RcppArmadillo/version/arma.h

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,12 @@
2323

2424

2525
// Purpose: By explicitly defining or undefining a variable the 'defined(...) that
26-
// is in RcppArmadilloForward.h works as expected
27-
26+
// is in RcppArmadilloForward.h works as expected allowing us to selectively include
27+
// either a 'legacy' Armadillo (i.e. 14.6.3. the last version to a) allow C++11 and
28+
// b) permit suppression of deprecation warnings) or a 'current' Armadillo (i.e. as
29+
// of this writing 15.0.1, or any later version)
30+
//
31+
// See https://github.com/RcppCore/RcppArmadillo/issues/475 for more details
2832

2933
// Sanity check: Cannot select both current and legacy but only one
3034
#if defined(ARMA_USE_CURRENT) && defined(ARMA_USE_LEGACY)
@@ -59,12 +63,12 @@
5963
// Show messages, adjusted for compilation standard (as we also want to move on from C++11)
6064
// We plan to 'at some point' flip to for C++14
6165
#if __cplusplus < 201402L
62-
#pragma message("Using fallback compilation with Armadillo 14.6.3. Please consider defining -DARMA_USE_CURRENT and also removing C++11 compilation directive")
66+
#pragma message("Using fallback compilation with Armadillo 14.6.3. Please consider defining -DARMA_USE_CURRENT and also removing C++11 compilation directive. See GitHub issue #475 for more.")
6367
// Define selector used in RcppArmadilloForward.h
6468
#define ARMA_SELECTED_LEGACY_VERSION
6569
#undef ARMA_SELECTED_CURRENT_VERSION
6670
#else
67-
#pragma message("Using fallback compilation with Armadillo 14.6.3. Please consider defining -DARMA_USE_CURRENT")
71+
#pragma message("Using fallback compilation with Armadillo 14.6.3. Please consider defining -DARMA_USE_CURRENT. See GitHub issue #475 for more.")
6872
// Define selector used in RcppArmadilloForward.h
6973
// It is our intention to select current here after transition instead of legacy
7074
#define ARMA_SELECTED_LEGACY_VERSION

0 commit comments

Comments
 (0)