Skip to content

Update gsl-lite to 1.0.1 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
musicinmybrain wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update gsl-lite to 1.0.1 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/GSL_LITE
Open in desktop
Submodule GSL_LITE updated from d6c8af to 56dab5
15 changes: 13 additions & 2 deletions include/morphio/vector_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
#pragma once

#if !gsl_CONFIG_ALLOWS_SPAN_COMPARISON
#include <algorithm>
#endif
#include <array>
#include <cmath> // M_PI
#include <vector>

#include <gsl/gsl-lite.hpp>
#include <gsl-lite/gsl-lite.hpp>

namespace morphio {

template <typename T>
using range = gsl::span<T>;
using range = gsl_lite::span<T>;

#if !gsl_CONFIG_ALLOWS_SPAN_COMPARISON
template <typename T>
inline bool operator==(morphio::range<T> l, morphio::range<T> r) {
return l.size() == r.size() &&
(l.data() == r.data() || std::equal(l.begin(), l.end(), r.begin()));
}
#endif

#ifdef MORPHIO_USE_DOUBLE
using floatType = double;
Expand Down
2 changes: 1 addition & 1 deletion tests/test_utilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <catch2/catch.hpp>
#include <gsl/gsl-lite.hpp>
#include <gsl-lite/gsl-lite.hpp>
#include <morphio/version.h>

#include <filesystem>
Expand Down
Loading