mirror of
https://github.com/mpusz/mp-units.git
synced 2025-08-02 11:54:27 +02:00
Dependency on gsl-lite removed as it causes issues with compiler-explorer
This commit is contained in:
@@ -45,8 +45,7 @@ class UnitsConan(ConanFile):
|
|||||||
exports = ["LICENSE.md"]
|
exports = ["LICENSE.md"]
|
||||||
settings = "os", "compiler", "build_type", "arch"
|
settings = "os", "compiler", "build_type", "arch"
|
||||||
requires = (
|
requires = (
|
||||||
"cmcstl2/2019.09.09@mpusz/stable",
|
"cmcstl2/2019.09.09@mpusz/stable"
|
||||||
"gsl-lite/0.33.0@nonstd-lite/stable"
|
|
||||||
)
|
)
|
||||||
scm = {
|
scm = {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
@@ -54,7 +54,6 @@ target_compile_features(units INTERFACE cxx_std_20)
|
|||||||
target_link_libraries(units
|
target_link_libraries(units
|
||||||
INTERFACE
|
INTERFACE
|
||||||
CONAN_PKG::cmcstl2
|
CONAN_PKG::cmcstl2
|
||||||
CONAN_PKG::gsl-lite
|
|
||||||
)
|
)
|
||||||
target_include_directories(units
|
target_include_directories(units
|
||||||
INTERFACE
|
INTERFACE
|
||||||
|
@@ -23,6 +23,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <experimental/ranges/concepts>
|
#include <experimental/ranges/concepts>
|
||||||
|
#include <exception>
|
||||||
|
|
||||||
|
|
||||||
|
#define Expects(cond) if(!(cond)) ::std::terminate();
|
||||||
|
|
||||||
namespace std {
|
namespace std {
|
||||||
|
|
||||||
|
@@ -25,7 +25,6 @@
|
|||||||
#include <units/unit.h>
|
#include <units/unit.h>
|
||||||
#include <units/bits/concepts.h>
|
#include <units/bits/concepts.h>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <gsl/gsl-lite.hpp>
|
|
||||||
|
|
||||||
namespace std::experimental::units {
|
namespace std::experimental::units {
|
||||||
|
|
||||||
|
@@ -22,10 +22,10 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <units/bits/hacks.h>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
#include <numeric>
|
#include <numeric>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <gsl/gsl-lite.hpp>
|
|
||||||
|
|
||||||
namespace std::experimental::units {
|
namespace std::experimental::units {
|
||||||
|
|
||||||
|
@@ -27,7 +27,6 @@ function(add_metabench_test target name erb_path range)
|
|||||||
target_link_libraries(${target}
|
target_link_libraries(${target}
|
||||||
PUBLIC
|
PUBLIC
|
||||||
CONAN_PKG::cmcstl2
|
CONAN_PKG::cmcstl2
|
||||||
CONAN_PKG::gsl-lite
|
|
||||||
)
|
)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
|
@@ -22,10 +22,12 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <exception>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
#include <numeric>
|
#include <numeric>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <gsl/gsl-lite.hpp>
|
|
||||||
|
#define Expects(cond) if(!(cond)) ::std::terminate();
|
||||||
|
|
||||||
namespace std::experimental::units {
|
namespace std::experimental::units {
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user