morphio 3.3.2__tar.gz → 3.3.4__tar.gz

{MorphIO-3.3.2 → MorphIO-3.3.4}/.github/workflows/check-sdist.yml

@@ -10,14 +10,14 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: 'true'
 
-      - name: Set up Python 3.6
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.6
+          python-version: 3.8
 
       - name: Build a source tarball
         run:

{MorphIO-3.3.2 → MorphIO-3.3.4}/.github/workflows/clang_format_check.yaml

@@ -11,7 +11,9 @@ jobs:
 
     steps:
         - name: Fetch repository
-          uses: actions/checkout@v1
+          uses: actions/checkout@v3
+          with:
+             fetch-depth: 2
         - name: Install apt
           run: sudo apt-get update -y
         - name: Install packages

{MorphIO-3.3.2 → MorphIO-3.3.4}/.github/workflows/coverage_test.yaml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Fetch repository
         run: git fetch --prune --unshallow
       - name: Get submodules

{MorphIO-3.3.2 → MorphIO-3.3.4}/.github/workflows/docstring_check.yaml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Fetch repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
       - name: Install packages

{MorphIO-3.3.2 → MorphIO-3.3.4}/.github/workflows/publish-sdist-wheels.yml

@@ -3,8 +3,8 @@ on: [pull_request, push]
 
 env:
   CIBW_BUILD_VERBOSITY: 3
-  CIBW_BUILD: 'cp3?-*'
-  CIBW_SKIP: 'cp35-* cp36-* *-manylinux_i686 *-musllinux_* *-win32'
+  CIBW_BUILD: 'cp*'
+  CIBW_SKIP: 'cp35-* cp36-* *-manylinux_i686 *-musllinux_* *-win32 cp311-win_amd64 cp311-macosx_x86_64'
   CIBW_BEFORE_TEST: pip install -r {project}/tests/requirement_tests.txt
   CIBW_TEST_COMMAND: pytest -s -v {project}/tests
 
@@ -17,14 +17,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-latest, windows-latest]
+        os: [ubuntu-20.04, macos-11, windows-2022]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: 'true'
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         name: Install Python
         with:
           python-version: '3.7'
@@ -37,7 +37,42 @@ jobs:
         if: runner.os == 'Linux'
         env:
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
-          CIBW_BEFORE_BUILD: 'yum update -y; yum -y install hdf5-devel'
+          CIBW_BEFORE_ALL: |
+            AEC_VERSION="1.0.4"
+            HDF5_VERSION="1.12.1"
+
+            yum update -y
+            yum -y install zlib-devel
+            pushd /tmp
+
+            echo "Downloading & unpacking aec ${AEC_VERSION}"
+            curl -fsSLO https://gitlab.dkrz.de/k202009/libaec/uploads/ea0b7d197a950b0c110da8dfdecbb71f/libaec-${AEC_VERSION}.tar.gz
+            tar zxf libaec-$AEC_VERSION.tar.gz
+
+            echo "Building & installing libaec"
+            pushd libaec-$AEC_VERSION
+            ./configure
+            make -j 2
+            make install
+            ldconfig
+            popd
+
+            echo "Downloading & unpacking HDF5 ${HDF5_VERSION}"
+            curl -fsSLO "https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-${HDF5_VERSION%.*}/hdf5-$HDF5_VERSION/src/hdf5-$HDF5_VERSION.tar.gz"
+            tar -xzvf hdf5-$HDF5_VERSION.tar.gz
+
+            echo "Building & installing HDF5"
+            pushd hdf5-$HDF5_VERSION
+            ./configure                      \
+              --prefix=/usr                  \
+              --enable-build-mode=production \
+              --with-szlib                   \
+              --enable-tools=no              \
+              --enable-tests=no
+            make -j 2
+            make install
+            ldconfig
+            popd
         run: |
           python -m cibuildwheel --output-dir dist
 
@@ -46,8 +81,10 @@ jobs:
         env:
           MACOSX_DEPLOYMENT_TARGET: '10.13'
           CIBW_BEFORE_BUILD: |
-            brew update
-            brew --version
+            #brew update
+            #brew --version
+            export HOMEBREW_NO_AUTO_UPDATE=1
+            export HDF5_DIR="$(brew --prefix hdf5)";
             brew install hdf5
         run: |
           python -m cibuildwheel --output-dir dist
@@ -66,14 +103,14 @@ jobs:
           C:\windows\system32\tar.exe xf hdf5-1.12.0-Std-win10_64-vs16.zip
           start /wait msiexec /a "%cd%\hdf\HDF5-1.12.0-win64.msi" /qn TARGETDIR="c:\hdf5\"
 
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" -vcvars_ver=14.0
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" -vcvars_ver=14.1
 
           set HDF5_DIR=C:\hdf5\HDF_Group\HDF5\1.12.0\cmake
 
           python -m cibuildwheel --output-dir dist
 
       - name: Store wheel as artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: dist
           path: dist/*.whl
@@ -84,12 +121,12 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: 'true'
 
       - name: Set up Python 3.7
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.7
 
@@ -105,7 +142,7 @@ jobs:
           pytest -s -v tests
 
       - name: Store sdist as artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: dist
           path: dist/*.tar.gz
@@ -119,7 +156,7 @@ jobs:
 
     steps:
       - name: Download artifacts produced during the build_wheels and build_sdist jobs
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist/

{MorphIO-3.3.2 → MorphIO-3.3.4}/.github/workflows/run-tests.yml

@@ -3,7 +3,7 @@ on: [pull_request, push]
 
 jobs:
   build:
-    name: Run tests on ${{ matrix.os }}
+    name: Run tests on ${{ matrix.os }}.${{ matrix.compiler.CC }}
     runs-on: ${{ matrix.os }}
 
     # Run on external PRs, but not internal PRs as they'll be run by the push
@@ -13,17 +13,23 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
         compiler:
-          - CC: clang
-            CXX: clang++
-          - CC: gcc
-            CXX: g++
+          - {CC: clang, CXX: clang++}
+          - {CC: gcc, CXX: g++}
+        exclude:
+          - os: macos-latest
+            compiler: {CC: gcc, CXX: g++}
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: 'true'
 
+      - name: Setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
       - name: Install packages on Linux
         if: runner.os == 'Linux'
         run: sudo apt-get update && sudo apt-get install build-essential libhdf5-dev
@@ -31,8 +37,11 @@ jobs:
       - name: Install packages on MacOS
         if: runner.os == 'macOS'
         run: |
-            brew update
-            brew --version
+            # { work around https://github.com/actions/setup-python/issues/577
+            #brew update
+            #brew --version
+            export HOMEBREW_NO_AUTO_UPDATE=1
+            # }
             brew install cmake || true  # macos image has cmake installed, but a new version may exist; ignore it if so
             brew install hdf5
 

{MorphIO-3.3.2 → MorphIO-3.3.4}/.gitignore

@@ -47,3 +47,4 @@ build/
 ci/venv*
 cmake-build*
 env*
+venv-clang-format/

{MorphIO-3.3.2 → MorphIO-3.3.4}/.gitmodules

@@ -2,7 +2,7 @@
 	path = 3rdparty/HighFive
 	url = https://github.com/BlueBrain/HighFive.git
 [submodule "3rdparty/pybind11"]
-	path = 3rdparty/pybind11
+	path = binds/python/pybind11
 	url = https://github.com/pybind/pybind11.git
 [submodule "3rdparty/GSL_LITE"]
 	path = 3rdparty/GSL_LITE
@@ -10,3 +10,6 @@
 [submodule "3rdparty/lexertl14"]
 	path = 3rdparty/lexertl14
 	url = https://github.com/BenHanson/lexertl14
+[submodule "3rdparty/Catch2"]
+	path = 3rdparty/Catch2
+	url = https://github.com/catchorg/Catch2.git

{MorphIO-3.3.2 → MorphIO-3.3.4}/.readthedocs.yaml

@@ -14,8 +14,18 @@ submodules:
 # doesn't find HDF5, if the hdf5 headers are available by the system, then
 # it works
 build:
+  os: "ubuntu-20.04"
   apt_packages:
     - libhdf5-dev
+  tools:
+    python: "3.9"
 
-conda:
-  environment: doc/environment.yml
+sphinx:
+  configuration: doc/source/conf.py
+
+python:
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs

{MorphIO-3.3.2 → MorphIO-3.3.4}/3rdparty/CMakeLists.txt

@@ -14,9 +14,3 @@ target_include_directories(gsl-lite SYSTEM INTERFACE)
 
 add_library(lexertl INTERFACE)
 target_include_directories(lexertl SYSTEM INTERFACE lexertl14/include)
-
-if(BUILD_BINDINGS)
-  add_subdirectory(pybind11)
-  target_include_directories(pybind11 SYSTEM INTERFACE
-    pybind11)
-endif()

MorphIO-3.3.4/3rdparty/GSL_LITE/CMakeLists.txt

@@ -0,0 +1,197 @@
+# Copyright 2015-2019 by Martin Moene
+# Copyright 2019-2021 by Moritz Beutel
+#
+# https://github.com/gsl-lite/gsl-lite
+#
+# gsl-lite is based on GSL: Guidelines Support Library,
+# https://github.com/microsoft/gsl
+#
+# This code is licensed under the MIT License (MIT).
+
+cmake_minimum_required( VERSION 3.5 FATAL_ERROR )
+
+# gsl-lite project and version, updated by script/update-version.py:
+
+project(
+    gsl_lite
+    VERSION 0.40.0
+#   DESCRIPTION "A single-file header-only version of ISO C++ Guideline Support Library (GSL) for C++98, C++11 and later"
+#   HOMEPAGE_URL "https://github.com/gsl-lite/gsl-lite"
+    LANGUAGES CXX )
+
+# Package information:
+
+set( unit_name       "gsl" )
+set( package_nspace  "gsl" )
+set( package_name    "${unit_name}-lite" )
+set( package_version "${${PROJECT_NAME}_VERSION}" )
+
+message( STATUS "Project '${PROJECT_NAME}', package '${package_name}' version: '${package_version}'" )
+
+# Do not build tests or examples by default:
+
+option( GSL_LITE_OPT_BUILD_TESTS             "Build and perform gsl-lite tests" OFF )
+option( GSL_LITE_OPT_BUILD_CUDA_TESTS        "Build and perform gsl-lite CUDA tests" OFF )
+option( GSL_LITE_OPT_BUILD_EXAMPLES          "Build gsl-lite examples" OFF )
+option( GSL_LITE_OPT_BUILD_STATIC_ANALYSIS_DEMOS "Build and perform gsl-lite static analysis demos" OFF )
+option( CMAKE_EXPORT_PACKAGE_REGISTRY        "Export build directory to CMake user package registry" OFF )
+option( GSL_LITE_OPT_INSTALL_COMPAT_HEADER   "Install MS-GSL compatibility header <gsl/gsl>" OFF )
+option( GSL_LITE_OPT_INSTALL_LEGACY_HEADERS  "Install legacy headers <gsl.h>, <gsl.hpp>, <gsl/gsl-lite.h>" OFF )
+
+# If requested, build and perform tests, build examples:
+
+if ( GSL_LITE_OPT_BUILD_TESTS )
+    set( ENABLE_TESTING ON )
+    include( CTest )
+    add_subdirectory( test )
+endif()
+if ( GSL_LITE_OPT_BUILD_CUDA_TESTS )
+    set( ENABLE_TESTING ON )
+    include( CTest )
+    add_subdirectory( test/cuda )
+endif()
+
+if ( GSL_LITE_OPT_BUILD_EXAMPLES )
+    add_subdirectory( example )
+endif()
+
+#
+# Interface, installation and packaging
+#
+
+# CMake helpers:
+
+include( GNUInstallDirs )
+include( CMakePackageConfigHelpers )
+
+# Interface library:
+
+add_library(
+    ${package_name} INTERFACE )
+add_library(
+    ${package_nspace}::${package_name} ALIAS ${package_name} )
+target_include_directories(
+    ${package_name}
+    INTERFACE
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>" )
+target_sources(
+    ${package_name}
+    INTERFACE
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gsl-lite.natvis>" )
+
+# Interface library for targets with versioned defaults:
+
+# "gsl-lite-v0" target for legacy defaults:
+add_library(
+    ${package_name}-v0 INTERFACE )
+add_library(
+    ${package_nspace}::${package_name}-v0 ALIAS ${package_name}-v0 )
+target_include_directories(
+    ${package_name}-v0
+    INTERFACE
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>" )
+target_sources(
+    ${package_name}-v0
+    INTERFACE
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gsl-lite.natvis>" )
+
+# "gsl-lite-v1" target for modern defaults:
+add_library(
+    ${package_name}-v1 INTERFACE )
+add_library(
+    ${package_nspace}::${package_name}-v1 ALIAS ${package_name}-v1 )
+target_include_directories(
+    ${package_name}-v1
+    INTERFACE
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>" )
+target_compile_definitions(
+    ${package_name}-v1
+    INTERFACE
+        gsl_CONFIG_DEFAULTS_VERSION=1)
+target_sources(
+    ${package_name}-v1
+    INTERFACE
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gsl-lite.natvis>" )
+
+# Package configuration:
+# Note: package_name and package_target are used in package_config_in
+
+set( package_folder         "${package_name}" )
+set( package_target         "${package_name}-targets" )
+set( package_config         "${package_name}-config.cmake" )
+set( package_config_in      "${package_name}-config.cmake.in" )
+set( package_config_version "${package_name}-config-version.cmake" )
+
+configure_package_config_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/${package_config_in}"
+    "${CMAKE_CURRENT_BINARY_DIR}/${package_config}"
+    INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${package_folder}"
+)
+
+configure_file(
+   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/${package_config_version}.in"
+   "${CMAKE_CURRENT_BINARY_DIR}/${package_config_version}" @ONLY
+)
+
+# Installation:
+
+install(
+    TARGETS      ${package_name} ${package_name}-v0 ${package_name}-v1
+    EXPORT       ${package_target}
+#   INCLUDES DESTINATION "${...}"  # already set via target_include_directories()
+)
+
+install(
+    EXPORT       ${package_target}
+    NAMESPACE    ${package_nspace}::
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${package_folder}"
+)
+
+export(
+    EXPORT       ${package_target}
+    NAMESPACE    ${package_nspace}::
+    FILE         "${CMAKE_CURRENT_BINARY_DIR}/${package_name}-targets.cmake"
+)
+
+if(CMAKE_EXPORT_PACKAGE_REGISTRY)
+    export(
+        PACKAGE  ${package_name}
+    )
+endif()
+
+install(
+    FILES       "${CMAKE_CURRENT_BINARY_DIR}/${package_config}"
+                "${CMAKE_CURRENT_BINARY_DIR}/${package_config_version}"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${package_folder}"
+)
+
+install(
+    FILES       "include/gsl/gsl-lite.hpp"
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/gsl/"
+)
+install(
+    FILES       "include/gsl-lite/gsl-lite.hpp"
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/gsl-lite/"
+)
+if(GSL_LITE_OPT_INSTALL_COMPAT_HEADER)
+    install(
+        FILES       "include/gsl/gsl"
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/gsl/"
+    )
+endif()
+if(GSL_LITE_OPT_INSTALL_LEGACY_HEADERS)
+    install(
+        FILES       "include/gsl/gsl-lite.h"
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/gsl/"
+    )
+    install(
+        FILES       "include/gsl.h"
+                    "include/gsl.hpp"
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/"
+    )
+endif()
+
+# end of file

MorphIO-3.3.4/3rdparty/GSL_LITE/cmake/gsl-lite-config-version.cmake.in

@@ -0,0 +1,24 @@
+# Adapted from write_basic_package_version_file(... COMPATIBILITY SameMajorVersion) output
+# ARCH_INDEPENDENT is only present in cmake 3.14 and onwards
+
+set( PACKAGE_VERSION "@package_version@" )
+
+if( PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION )
+    set( PACKAGE_VERSION_COMPATIBLE FALSE )
+else()
+    if( "@package_version@" MATCHES "^([0-9]+)\\." )
+        set( CVF_VERSION_MAJOR "${CMAKE_MATCH_1}" )
+    else()
+        set( CVF_VERSION_MAJOR "@package_version@" )
+    endif()
+
+    if( PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR )
+        set( PACKAGE_VERSION_COMPATIBLE TRUE )
+    else()
+        set( PACKAGE_VERSION_COMPATIBLE FALSE )
+    endif()
+
+    if( PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION )
+        set( PACKAGE_VERSION_EXACT TRUE )
+    endif()
+endif()

MorphIO-3.3.4/3rdparty/GSL_LITE/cmake/gsl-lite-config.cmake.in

@@ -0,0 +1,7 @@
+@PACKAGE_INIT@
+
+# Only include targets once:
+
+if( NOT TARGET @package_nspace@::@package_name@ )
+    include( "${CMAKE_CURRENT_LIST_DIR}/@package_target@.cmake" )
+endif()

{MorphIO-3.3.2 → MorphIO-3.3.4}/3rdparty/GSL_LITE/gsl-lite.natvis

@@ -41,6 +41,9 @@
   </Type>
 
   <Type Name="gsl::not_null&lt;*&gt;">
-    <DisplayString>value = {*ptr_}</DisplayString>
+      <DisplayString>{data_.ptr_}</DisplayString>
+      <Expand>
+          <ExpandedItem>data_.ptr_</ExpandedItem>
+      </Expand>
   </Type>
 </AutoVisualizer>

{MorphIO-3.3.2 → MorphIO-3.3.4}/3rdparty/GSL_LITE/include/gsl/gsl

@@ -1,5 +1,5 @@
 //
-// gsl-lite is based on GSL: Guideline Support Library.
+// gsl-lite is based on GSL: Guidelines Support Library.
 // For more information see https://github.com/martinmoene/gsl-lite
 //
 // Copyright (c) 2015 Martin Moene
@@ -22,6 +22,8 @@
 #ifndef GSL_GSL_H_INCLUDED
 #define GSL_GSL_H_INCLUDED
 
+#pragma message ("gsl/gsl is deprecated since version 0.38.1, use gsl/gsl-lite.hpp instead.")
+
 #include "gsl-lite.hpp"
 
 #endif // GSL_GSL_H_INCLUDED

{MorphIO-3.3.2 → MorphIO-3.3.4}/3rdparty/GSL_LITE/include/gsl/gsl-lite-vc6.hpp

@@ -1,6 +1,6 @@
 //
-// gsl-lite-vc6 is based on GSL: Guideline Support Library,
-// For more information see https://github.com/martinmoene/gsl-lite
+// gsl-lite-vc6 is based on GSL: Guidelines Support Library,
+// For more information see https://github.com/gsl-lite/gsl-lite
 //
 // Copyright (c) 2015 Martin Moene
 // Copyright (c) 2015 Microsoft Corporation. All rights reserved.
@@ -33,20 +33,20 @@
 
 // Configuration:
 
-#ifndef  gsl_FEATURE_HAVE_IMPLICIT_MACRO
-# define gsl_FEATURE_HAVE_IMPLICIT_MACRO  1
+#ifndef  gsl_FEATURE_IMPLICIT_MACRO
+# define gsl_FEATURE_IMPLICIT_MACRO  1
 #endif
 
-#ifndef  gsl_FEATURE_HAVE_OWNER_MACRO
-# define gsl_FEATURE_HAVE_OWNER_MACRO  1
+#ifndef  gsl_FEATURE_OWNER_MACRO
+# define gsl_FEATURE_OWNER_MACRO  1
 #endif
 
-#ifndef  gsl_FEATURE_HAVE_SHARED_PTR
-# define gsl_FEATURE_HAVE_SHARED_PTR  0
+#ifndef  gsl_FEATURE_SHARED_PTR
+# define gsl_FEATURE_SHARED_PTR  0
 #endif
 
-#ifndef  gsl_FEATURE_HAVE_UNIQUE_PTR
-# define gsl_FEATURE_HAVE_UNIQUE_PTR  0
+#ifndef  gsl_FEATURE_UNIQUE_PTR
+# define gsl_FEATURE_UNIQUE_PTR  0
 #endif
 
 #ifndef  gsl_CONFIG_THROWS_FOR_TESTING
@@ -75,35 +75,37 @@
 
 // Compiler detection:
 
-#if defined(_MSC_VER)
-# define gsl_COMPILER_MSVC_VERSION   (_MSC_VER / 100 - 5 - (_MSC_VER < 1900))
+#if defined(_MSC_VER ) && !defined(__clang__)
+# define gsl_COMPILER_MSVC_VER      (_MSC_VER )
+# define gsl_COMPILER_MSVC_VERSION  (_MSC_VER / 10 - 10 * ( 5 + (_MSC_VER < 1900 ) ) )
 #else
+# define gsl_COMPILER_MSVC_VER       0
 # define gsl_COMPILER_MSVC_VERSION   0
 # define gsl_COMPILER_NON_MSVC       1
 #endif
 
-#if gsl_COMPILER_MSVC_VERSION != 6
+#if gsl_COMPILER_MSVC_VERSION != 60
 # error GSL Lite: this header is for Visual C++ 6
 #endif
 
 // half-open range [lo..hi):
-#define gsl_BETWEEN( v, lo, hi ) ( lo <= v && v < hi )
+#define gsl_BETWEEN( v, lo, hi ) ( (lo) <= (v) && (v) < (hi) )
 
 // Presence of C++ language features:
 
 // C++ feature usage:
 
-#if gsl_FEATURE_HAVE_IMPLICIT_MACRO
+#if gsl_FEATURE_IMPLICIT_MACRO
 # define implicit
 #endif
 
 #define gsl_DIMENSION_OF( a ) ( sizeof(a) / sizeof(0[a]) )
 
-#if gsl_FEATURE_HAVE_SHARED_PTR
+#if gsl_FEATURE_SHARED_PTR
 # include gsl_CONFIG_SHARED_PTR_INCLUDE
 #endif
 
-#if gsl_FEATURE_HAVE_UNIQUE_PTR
+#if gsl_FEATURE_UNIQUE_PTR
 # include gsl_CONFIG_UNIQUE_PTR_INCLUDE
 #endif
 
@@ -113,10 +115,10 @@ namespace gsl {
 // GSL.owner: ownership pointers
 //
 // ToDo:
-#if gsl_FEATURE_HAVE_SHARED_PTR
+#if gsl_FEATURE_SHARED_PTR
   using gsl_CONFIG_SHARED_PTR_DECL;
 #endif
-#if gsl_FEATURE_HAVE_UNIQUE_PTR
+#if gsl_FEATURE_UNIQUE_PTR
   using gsl_CONFIG_UNIQUE_PTR_DECL;
 #endif
 
@@ -124,7 +126,7 @@ template< class T > struct owner { typedef T type; };
 
 #define gsl_HAVE_OWNER_TEMPLATE  0
 
-#if gsl_FEATURE_HAVE_OWNER_MACRO
+#if gsl_FEATURE_OWNER_MACRO
 # define Owner(t)  ::gsl::owner<t>::type
 #endif
 
@@ -655,7 +657,7 @@ namespace detail {
 template<class T, class SizeType, const T Sentinel>
 struct ensure
 {
-    static span<T> sentinel( T * seq, SizeType max = std::numeric_limits<SizeType>::max() )
+    static span<T> sentinel( T * seq, SizeType max = (std::numeric_limits<SizeType>::max)() )
     {
         typedef T * pointer;
         typedef typename std::iterator_traits<pointer>::difference_type difference_type;
@@ -679,7 +681,7 @@ struct ensure
 //
 
 template< typename T >
-span<T> ensure_z( T * sz, size_t max = std::numeric_limits<size_t>::max() )
+span<T> ensure_z( T * sz, size_t max = (std::numeric_limits<size_t>::max)() )
 {
     return detail::ensure<T, size_t, 0>::sentinel( sz, max );
 }