From 6b03ed30381d7494a1229d20a85b1784621d28c6 Mon Sep 17 00:00:00 2001 From: Oliver Sander <sander@igpm.rwth-aachen.de> Date: Tue, 17 Jun 2014 18:28:23 +0000 Subject: [PATCH] Remove the line #undef overwrite Newer versions of ADOL-C do not define 'overwrite' anymore, hence there is no risk of macro clashing. [[Imported from SVN: r9798]] --- cosserat-continuum.cc | 1 - dune/gfe/localgeodesicfeadolcstiffness.hh | 2 -- 2 files changed, 3 deletions(-) diff --git a/cosserat-continuum.cc b/cosserat-continuum.cc index c3ada0cb..9adffa55 100644 --- a/cosserat-continuum.cc +++ b/cosserat-continuum.cc @@ -9,7 +9,6 @@ #include <adolc/adouble.h> #include <adolc/drivers/drivers.h> // use of "Easy to Use" drivers #include <adolc/taping.h> -#undef overwrite // stupid: ADOL-C sets this to 1, so the name cannot be used #include <dune/gfe/adolcnamespaceinjections.hh> #include <dune/common/bitsetvector.hh> diff --git a/dune/gfe/localgeodesicfeadolcstiffness.hh b/dune/gfe/localgeodesicfeadolcstiffness.hh index 2f154dab..a1b7a878 100644 --- a/dune/gfe/localgeodesicfeadolcstiffness.hh +++ b/dune/gfe/localgeodesicfeadolcstiffness.hh @@ -6,8 +6,6 @@ // gradient(.) and hessian(.) #include <adolc/taping.h> // use of taping -#undef overwrite // stupid: ADOL-C sets this to 1, so the name cannot be used - #include <dune/gfe/adolcnamespaceinjections.hh> #include <dune/common/fmatrix.hh> -- GitLab