From 20bb7a4c5d20a4b9a3ef529cb7d12da9b8453f55 Mon Sep 17 00:00:00 2001 From: James Avery Date: Fri, 10 Nov 2023 21:20:48 +0200 Subject: [PATCH] Issue #10: Cray CC doesn't like list initializers with one element. Rewrote to slightly less nice (1,element) vector constructor --- src/c++/planargraph.cc | 2 +- src/c++/spiralc.cc | 2 +- src/c++/triangulation.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/c++/planargraph.cc b/src/c++/planargraph.cc index c6e384c1..7ad07f8e 100644 --- a/src/c++/planargraph.cc +++ b/src/c++/planargraph.cc @@ -907,7 +907,7 @@ face_t PlanarGraph::get_face_oriented(const dedge_t &e, int Fmax) const int i=0; node_t u = e.first, v=e.second; - face_t f = vector{{u}}; + face_t f = vector{1,u}; while(v!=e.first){ node_t w = prev(v,u); // Previous neighbour to u in v defines corner u-v-w in face diff --git a/src/c++/spiralc.cc b/src/c++/spiralc.cc index e01af01e..29d15f40 100644 --- a/src/c++/spiralc.cc +++ b/src/c++/spiralc.cc @@ -143,7 +143,7 @@ spiral_nomenclature::spiral_nomenclature(const string &str) : naming_scheme(CAGE if (suffix == "fullerene"){ naming_scheme = FULLERENE; base_face_degree = 6; - face_degrees = vector{{5}}; + face_degrees = vector(1,5); } if(suffix == "fulleroid"){ diff --git a/src/c++/triangulation.cc b/src/c++/triangulation.cc index 9f698904..18d472fb 100644 --- a/src/c++/triangulation.cc +++ b/src/c++/triangulation.cc @@ -867,7 +867,7 @@ void Triangulation::symmetry_information(int N_generators, Graph& coxeter_diagra vector draw_path(int major, int minor) { - if(minor == 0) return {{major}}; + if(minor == 0) return {1,major}; int slope = major/minor, slope_remainder = major%minor, slope_accumulator = 0;