Commit e29abe01 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

seriesadapater type 'deduction'...

parent 84b2ea60
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -130,6 +130,14 @@ protected:
          y_ind_);
    }

    if (testSeriesSchema2D<std::string, double>(x, y)) {
      return new SeriesAdapter2D<T, std::string, double>(
          drawable_,
          name_ind_,
          x_ind_,
          y_ind_);
    }

    return new SeriesAdapter2D<T, std::string, std::string>(
        drawable_,
        name_ind_,
+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ double SValue::getFloat() const {
      try {
        return std::stod(getString());
      } catch (std::exception e) {
        /* FALLTHROUGH */
        /* fallthrough */
      }

    default:
+6 −4
Original line number Diff line number Diff line
@@ -75,13 +75,15 @@ protected:

template <typename T>
bool SValue::testType() const {
  bool retval = false;

  try {
    getValue<T>();
  } catch (TypeError e) {
    return false;
    auto val = getValue<T>();
    retval = true;
  } catch (std::exception e) {
  }

  return true;
  return retval;
}

}