-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <stdexcept>
#include <string>
#include <string>
-#include <type_traits>
-#include <typeinfo>
#include <vector>
#include "simgrid/Exception.hpp"
double res = std::strtod(value, &end);
if (errno == ERANGE)
throw std::range_error("out of range");
- else if (errno)
- xbt_die("Unexpected errno");
+ xbt_assert(errno == 0, "Unexpected errno: %d", errno);
if (end == value || *end != '\0')
throw std::range_error("invalid double");
- else
- return res;
+ return res;
}
long int parse_long(const char* value)
char* end;
errno = 0;
long int res = std::strtol(value, &end, 0);
- if (errno) {
- if (res == LONG_MIN && errno == ERANGE)
- throw std::range_error("underflow");
- else if (res == LONG_MAX && errno == ERANGE)
- throw std::range_error("overflow");
- xbt_die("Unexpected errno");
- }
+ if (errno == ERANGE)
+ throw std::range_error(res == LONG_MIN ? "underflow" : "overflow");
+ xbt_assert(errno == 0, "Unexpected errno: %d", errno);
if (end == value || *end != '\0')
throw std::range_error("invalid integer");
- else
- return res;
+ return res;
}
// ***** ConfigType *****
TypedConfigurationElement(const std::string& key, const std::string& desc, T value, std::function<void(T&)> callback)
: ConfigurationElement(key, desc), content(std::move(value)), callback(std::move(callback))
{}
- ~TypedConfigurationElement() override = default;
std::string get_string_value() override;
const char* get_type_name() override;
class Config {
private:
// name -> ConfigElement:
- std::map<std::string, std::unique_ptr<ConfigurationElement>> options;
+ std::map<std::string, std::unique_ptr<ConfigurationElement>, std::less<>> options;
// alias -> ConfigElement from options:
- std::map<std::string, ConfigurationElement*> aliases;
+ std::map<std::string, ConfigurationElement*, std::less<>> aliases;
bool warn_for_aliases = true;
public: