From: Wolfgang Bangerth Date: Wed, 11 Feb 2015 13:58:30 +0000 (-0600) Subject: Disambiguate the use of operator* X-Git-Tag: v8.3.0-rc1~478^2~6 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7983f035eeb518eae2f6f0f24cee0c7a936cc4a6;p=dealii.git Disambiguate the use of operator* --- diff --git a/tests/deal.II/kelly_crash_02.cc b/tests/deal.II/kelly_crash_02.cc index 4be39cbd62..e56a656ee9 100644 --- a/tests/deal.II/kelly_crash_02.cc +++ b/tests/deal.II/kelly_crash_02.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2006 - 2014 by the deal.II authors +// Copyright (C) 2006 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -105,66 +105,66 @@ void test () // points 15-18 Point(0, 0, 7) + Point (std::cos(2*numbers::PI/6), std::sin(2*numbers::PI/6), - 0) * 4, + 0) * 4.0, Point(std::cos(0*numbers::PI/6), std::sin(0*numbers::PI/6), 7) + Point (std::cos(2*numbers::PI/6), std::sin(2*numbers::PI/6), - 0) * 4, + 0) * 4.0, Point(std::cos(2*numbers::PI/6), std::sin(2*numbers::PI/6), 7) + Point (std::cos(2*numbers::PI/6), std::sin(2*numbers::PI/6), - 0) * 4, + 0) * 4.0, Point(std::cos(4*numbers::PI/6), std::sin(4*numbers::PI/6), 7) + Point (std::cos(2*numbers::PI/6), std::sin(2*numbers::PI/6), - 0) * 4, + 0) * 4.0, // points at the top of the // second extension // points 19-22 Point(0, 0, 7) + Point (std::cos(6*numbers::PI/6), std::sin(6*numbers::PI/6), - 0) * 4, + 0) * 4.0, Point(std::cos(4*numbers::PI/6), std::sin(4*numbers::PI/6), 7) + Point (std::cos(6*numbers::PI/6), std::sin(6*numbers::PI/6), - 0) * 4, + 0) * 4.0, Point(std::cos(6*numbers::PI/6), std::sin(6*numbers::PI/6), 7) + Point (std::cos(6*numbers::PI/6), std::sin(6*numbers::PI/6), - 0) * 4, + 0) * 4.0, Point(std::cos(8*numbers::PI/6), std::sin(8*numbers::PI/6), 7) + Point (std::cos(6*numbers::PI/6), std::sin(6*numbers::PI/6), - 0) * 4, + 0) * 4.0, // points at the top of the // third extension // points 23-26 Point(0, 0, 7) + Point (std::cos(10*numbers::PI/6), std::sin(10*numbers::PI/6), - 0) * 4, + 0) * 4.0, Point(std::cos(8*numbers::PI/6), std::sin(8*numbers::PI/6), 7) + Point (std::cos(10*numbers::PI/6), std::sin(10*numbers::PI/6), - 0) * 4, + 0) * 4.0, Point(std::cos(10*numbers::PI/6), std::sin(10*numbers::PI/6), 7) + Point (std::cos(10*numbers::PI/6), std::sin(10*numbers::PI/6), - 0) * 4, + 0) * 4.0, Point(std::cos(0*numbers::PI/6), std::sin(0*numbers::PI/6), 7) + Point (std::cos(10*numbers::PI/6), std::sin(10*numbers::PI/6), - 0) * 4, + 0) * 4.0, };