From 1c68098780ec9891b489f83cc230c4f23c26d1cc Mon Sep 17 00:00:00 2001 From: Ed Bennett Date: Fri, 27 Jan 2017 22:04:26 +0000 Subject: [PATCH 1/3] fix misleading message: "doxygen-pdf requires doxygen-pdf" --- m4/ax_prog_doxygen.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4 index fd145991..a3d90ace 100644 --- a/m4/ax_prog_doxygen.m4 +++ b/m4/ax_prog_doxygen.m4 @@ -316,7 +316,7 @@ AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1]) AC_DEFUN([DX_CHECK_DEPEND], [ test "$DX_FLAG_$1" = "$2" \ || AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1, - requires, contradicts) doxygen-DX_CURRENT_FEATURE]) + requires, contradicts) doxygen-$1]) ]) # DX_CLEAR_DEPEND(FEATURE, REQUIRED_FEATURE, REQUIRED_STATE) From 15e668eef140b22bda76446de30fc913cae502b6 Mon Sep 17 00:00:00 2001 From: Francesco Sanfilippo Date: Mon, 20 Feb 2017 22:49:06 +0100 Subject: [PATCH 2/3] now it is possible to pass {coords list} to a peek or poke --- lib/cartesian/Cartesian_base.h | 2 +- lib/cartesian/Cartesian_full.h | 2 +- lib/cartesian/Cartesian_red_black.h | 2 +- lib/lattice/Lattice_peekpoke.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/cartesian/Cartesian_base.h b/lib/cartesian/Cartesian_base.h index 72b21ee3..bd5fd11c 100644 --- a/lib/cartesian/Cartesian_base.h +++ b/lib/cartesian/Cartesian_base.h @@ -77,7 +77,7 @@ public: // GridCartesian / GridRedBlackCartesian //////////////////////////////////////////////////////////////// virtual int CheckerBoarded(int dim)=0; - virtual int CheckerBoard(std::vector &site)=0; + virtual int CheckerBoard(const std::vector &site)=0; virtual int CheckerBoardDestination(int source_cb,int shift,int dim)=0; virtual int CheckerBoardShift(int source_cb,int dim,int shift,int osite)=0; virtual int CheckerBoardShiftForCB(int source_cb,int dim,int shift,int cb)=0; diff --git a/lib/cartesian/Cartesian_full.h b/lib/cartesian/Cartesian_full.h index b0d20441..7e29d311 100644 --- a/lib/cartesian/Cartesian_full.h +++ b/lib/cartesian/Cartesian_full.h @@ -49,7 +49,7 @@ public: virtual int CheckerBoarded(int dim){ return 0; } - virtual int CheckerBoard(std::vector &site){ + virtual int CheckerBoard(const std::vector &site){ return 0; } virtual int CheckerBoardDestination(int cb,int shift,int dim){ diff --git a/lib/cartesian/Cartesian_red_black.h b/lib/cartesian/Cartesian_red_black.h index 6a4300d7..2f132c19 100644 --- a/lib/cartesian/Cartesian_red_black.h +++ b/lib/cartesian/Cartesian_red_black.h @@ -49,7 +49,7 @@ public: if( dim==_checker_dim) return 1; else return 0; } - virtual int CheckerBoard(std::vector &site){ + virtual int CheckerBoard(const std::vector &site){ int linear=0; assert(site.size()==_ndimension); for(int d=0;d<_ndimension;d++){ diff --git a/lib/lattice/Lattice_peekpoke.h b/lib/lattice/Lattice_peekpoke.h index 19d349c4..b3e53a27 100644 --- a/lib/lattice/Lattice_peekpoke.h +++ b/lib/lattice/Lattice_peekpoke.h @@ -86,7 +86,7 @@ PARALLEL_FOR_LOOP // Poke a scalar object into the SIMD array ////////////////////////////////////////////////////// template - void pokeSite(const sobj &s,Lattice &l,std::vector &site){ + void pokeSite(const sobj &s,Lattice &l,const std::vector &site){ GridBase *grid=l._grid; @@ -120,7 +120,7 @@ PARALLEL_FOR_LOOP // Peek a scalar object from the SIMD array ////////////////////////////////////////////////////////// template - void peekSite(sobj &s,const Lattice &l,std::vector &site){ + void peekSite(sobj &s,const Lattice &l,const std::vector &site){ GridBase *grid=l._grid; From 041884acf0b63a3f8c3a9d8885f0431c8c3e0e01 Mon Sep 17 00:00:00 2001 From: Francesco Sanfilippo Date: Tue, 21 Feb 2017 15:31:35 +0100 Subject: [PATCH 3/3] Prepending PACKAGE_ with GRID_ in Config.h Avoid polluting linking progr --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d3ba9de2..95f573f5 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(subdir-objects) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([lib/Grid.h]) -AC_CONFIG_HEADERS([lib/Config.h]) +AC_CONFIG_HEADERS([lib/Config.h],[sed -i 's|PACKAGE_|GRID_|' lib/Config.h]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) ############### Checks for programs