Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 40de4b0f3bde
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5eec2a7a4921
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 25, 2020

  1. Fix errors found by Clang.

    pleroy committed Jun 25, 2020
    Copy the full SHA
    ff1e96a View commit details
  2. Merge pull request #2613 from pleroy/Clang

    Fix errors found by Clang
    pleroy authored Jun 25, 2020
    Copy the full SHA
    5eec2a7 View commit details
Showing with 15 additions and 15 deletions.
  1. +9 −9 numerics/poisson_series.hpp
  2. +6 −6 numerics/poisson_series_body.hpp
18 changes: 9 additions & 9 deletions numerics/poisson_series.hpp
Original file line number Diff line number Diff line change
@@ -59,22 +59,22 @@ class PoissonSeries {
PoissonSeries<V, l, E> const& left,
PoissonSeries<V, r, E> const& right);
template<typename Scalar,
typename V, int degree_,
typename V, int d,
template<typename, typename, int> class E>
PoissonSeries<Product<Scalar, V>, degree_, E> friend operator*(
PoissonSeries<Product<Scalar, V>, d, E> friend operator*(
Scalar const& left,
PoissonSeries<V, degree_, E> const& right);
PoissonSeries<V, d, E> const& right);
template<typename Scalar,
typename V, int degree_,
typename V, int d,
template<typename, typename, int> class E>
PoissonSeries<Product<V, Scalar>, degree_, E> friend operator*(
PoissonSeries<V, degree_, E> const& left,
PoissonSeries<Product<V, Scalar>, d, E> friend operator*(
PoissonSeries<V, d, E> const& left,
Scalar const& right);
template<typename Scalar,
typename V, int degree_,
typename V, int d,
template<typename, typename, int> class E>
PoissonSeries<Quotient<V, Scalar>, degree_, E> friend operator/(
PoissonSeries<V, degree_, E> const& left,
PoissonSeries<Quotient<V, Scalar>, d, E> friend operator/(
PoissonSeries<V, d, E> const& left,
Scalar const& right);
};

12 changes: 6 additions & 6 deletions numerics/poisson_series_body.hpp
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ template<typename Value, int rdegree_,
PoissonSeries<Value, rdegree_, Evaluator>
operator-(PoissonSeries<Value, rdegree_, Evaluator> const& right) {
using Result = PoissonSeries<Value, rdegree_, Evaluator>;
Result::PolynomialsByAngularFrequency periodic;
typename Result::PolynomialsByAngularFrequency periodic;
auto const aperiodic = -right.aperiodic_;
for (auto const& [ω, polynomials] : right.periodic_) {
periodic.emplace(ω,
@@ -88,7 +88,7 @@ PoissonSeries<Value, std::max(ldegree_, rdegree_), Evaluator>
operator+(PoissonSeries<Value, ldegree_, Evaluator> const& left,
PoissonSeries<Value, rdegree_, Evaluator> const& right) {
using Result = PoissonSeries<Value, std::max(ldegree_, rdegree_), Evaluator>;
Result::PolynomialsByAngularFrequency periodic;
typename Result::PolynomialsByAngularFrequency periodic;
auto const aperiodic = left.aperiodic_ + right.aperiodic_;
auto it_left = left.periodic_.cbegin();
auto it_right = right.periodic_.cbegin();
@@ -128,7 +128,7 @@ PoissonSeries<Value, std::max(ldegree_, rdegree_), Evaluator>
operator-(PoissonSeries<Value, ldegree_, Evaluator> const& left,
PoissonSeries<Value, rdegree_, Evaluator> const& right) {
using Result = PoissonSeries<Value, std::max(ldegree_, rdegree_), Evaluator>;
Result::PolynomialsByAngularFrequency periodic;
typename Result::PolynomialsByAngularFrequency periodic;
auto const aperiodic = left.aperiodic_ - right.aperiodic_;
auto it_left = left.periodic_.cbegin();
auto it_right = right.periodic_.cbegin();
@@ -171,7 +171,7 @@ PoissonSeries<Product<Scalar, Value>, degree_, Evaluator>
operator*(Scalar const& left,
PoissonSeries<Value, degree_, Evaluator> const& right) {
using Result = PoissonSeries<Product<Scalar, Value>, degree_, Evaluator>;
Result::PolynomialsByAngularFrequency periodic;
typename Result::PolynomialsByAngularFrequency periodic;
auto const aperiodic = left * right.aperiodic_;
for (auto const& [ω, polynomials] : right.periodic_) {
periodic.emplace(ω,
@@ -187,7 +187,7 @@ PoissonSeries<Product<Value, Scalar>, degree_, Evaluator>
operator*(PoissonSeries<Value, degree_, Evaluator> const& left,
Scalar const& right) {
using Result = PoissonSeries<Product<Scalar, Value>, degree_, Evaluator>;
Result::PolynomialsByAngularFrequency periodic;
typename Result::PolynomialsByAngularFrequency periodic;
auto const aperiodic = left.aperiodic_ * right;
for (auto const& [ω, polynomials] : left.periodic_) {
periodic.emplace(ω,
@@ -203,7 +203,7 @@ PoissonSeries<Quotient<Value, Scalar>, degree_, Evaluator>
operator/(PoissonSeries<Value, degree_, Evaluator> const& left,
Scalar const& right) {
using Result = PoissonSeries<Product<Scalar, Value>, degree_, Evaluator>;
Result::PolynomialsByAngularFrequency periodic;
typename Result::PolynomialsByAngularFrequency periodic;
auto const aperiodic = left.aperiodic_ / right;
for (auto const& [ω, polynomials] : left.periodic_) {
periodic.emplace(ω,