[Dune-devel] [Dune-Commit] [Commit] dune-istl - 636c722: [release][matrixmarket][bugfix] mark non-template functions inline to avoid linker errors.

[Carsten Gräser]

Dear Robert,
please always remember to use 'git cherry-pick -x' when cherry-picking.
Otherwise it's significantly more work to track what already
went into the release branch because this can no longer be done
(semi-)automatically.

Best,
Carsten



Am 03.08.2015 um 13:14 schrieb Robert K:
> New commit, appeared at Mon Aug  3 13:14:09 2015 +0200
> as part of the following ref changes:
> 
>     branch refs/heads/releases/2.4    updated from d6769b7 -> 636c722
> 
> Browsable version: http://cgit.dune-project.org/repositories/dune-istl/commit/?id=636c722b168a026d1a9341bebb3c855459ebdc8a
> 
> ======================================================================
> 
> commit 636c722b168a026d1a9341bebb3c855459ebdc8a
> Author: Robert K <robertk at posteo.org>
> Date:   Mon Aug 3 13:09:14 2015 +0200
> 
>     [release][matrixmarket][bugfix] mark non-template functions inline to avoid linker errors.
> 
>  dune/istl/matrixmarket.hh | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> 
> 
> diff --git a/dune/istl/matrixmarket.hh b/dune/istl/matrixmarket.hh
> index 3d0db38..68e3e25 100644
> --- a/dune/istl/matrixmarket.hh
> +++ b/dune/istl/matrixmarket.hh
> @@ -269,7 +269,7 @@ namespace Dune
>        MM_STRUCTURE structure;
>      };
>  
> -    bool lineFeed(std::istream& file)
> +    inline bool lineFeed(std::istream& file)
>      {
>        char c;
>        if(!file.eof())
> @@ -293,7 +293,7 @@ namespace Dune
>        return false;
>      }
>  
> -    void skipComments(std::istream& file)
> +    inline void skipComments(std::istream& file)
>      {
>        lineFeed(file);
>        char c=file.peek();
> @@ -307,7 +307,7 @@ namespace Dune
>      }
>  
>  
> -    bool readMatrixMarketBanner(std::istream& file, MMHeader& mmHeader)
> +    inline bool readMatrixMarketBanner(std::istream& file, MMHeader& mmHeader)
>      {
>        std::string buffer;
>        char c;
> @@ -572,7 +572,7 @@ namespace Dune
>        return is>>num.number;
>      }
>  
> -    std::istream& operator>>(std::istream& is, NumericWrapper<PatternDummy>& num)
> +    inline std::istream& operator>>(std::istream& is, NumericWrapper<PatternDummy>& num)
>      {
>        DUNE_UNUSED_PARAMETER(num);
>        return is;
> @@ -701,9 +701,9 @@ namespace Dune
>    {};
>  
>  
> -  void mm_read_header(std::size_t& rows, std::size_t& cols,
> -                      MatrixMarketImpl::MMHeader& header, std::istream& istr,
> -                      bool isVector)
> +  inline void mm_read_header(std::size_t& rows, std::size_t& cols,
> +                             MatrixMarketImpl::MMHeader& header, std::istream& istr,
> +                             bool isVector)
>    {
>      using namespace MatrixMarketImpl;
>  
> 
> _______________________________________________
> Dune-Commit mailing list
> Dune-Commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-commit
> 


-- 
Prof. Dr. Carsten Gräser
Freie Universität Berlin
Institut für Mathematik
Arnimallee 6
14195 Berlin, Germany
phone: +49 30 838 72637
fax  : +49 30 838 472637
email: graeser at mi.fu-berlin.de
URL  : http://page.mi.fu-berlin.de/graeser

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <https://lists.dune-project.org/pipermail/dune-devel/attachments/20150818/7a265905/attachment.sig>