[Flexiblesusy-commits] [FlexibleSUSY/FlexibleSUSY] 6bb28e: Bugfix: Which() must return common type of all arg...

[GitHub]

  Branch: refs/heads/feature-2.0
  Home:   https://github.com/FlexibleSUSY/FlexibleSUSY
  Commit: 6bb28e285352539c8603995b2d87b084c2edb44d
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/6bb28e285352539c8603995b2d87b084c2edb44d
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M src/wrappers.hpp
    M test/test_wrappers.cpp

  Log Message:
  -----------
  Bugfix: Which() must return common type of all argumets

If Which() returns the type of the first argument, the second one
might be converted to the first type.  This might result in chopping
off digits if the first type is int and the second one is double.


  Commit: 0a29121c6bd06b1d695a14a40817689911a6e6c7
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/0a29121c6bd06b1d695a14a40817689911a6e6c7
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M src/wrappers.hpp
    M test/test_wrappers.cpp

  Log Message:
  -----------
  Merge remote-tracking branch 'organization/development' into feature-2.0

Conflicts:
	src/wrappers.hpp


Compare: https://github.com/FlexibleSUSY/FlexibleSUSY/compare/1b543ff4248a...0a29121c6bd0