Merge pull request #16 from igaztanaga/patch-1

Small fix for Wsign-conversion
2025-07-13 12:46:33 +02:00 · 2021-10-13 16:03:23 +01:00 · 2021-10-13 15:10:36 +02:00 · 2021-06-10 16:34:02 +03:00 · 2021-06-10 02:06:15 +03:00 · 2021-01-21 18:01:26 +00:00
4 changed files with 9 additions and 15 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -275,8 +275,9 @@ matrix:
      env: CMAKE=1
      script:
        - mkdir __build__ && cd __build__
-        - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=static_assert ..
-        - ctest --output-on-failure -R boost_static_assert
+        - cmake -DBUILD_TESTING=ON -DBOOST_INCLUDE_LIBRARIES=static_assert ..
+        - cmake --build . --target tests
+        - ctest --output-on-failure

    - os: linux
      env: CMAKE_SUBDIR=1
@ -292,8 +293,9 @@ matrix:
    - os: linux
      env: CMAKE_INSTALL=1
      script:
+        - pip install --user cmake
        - mkdir __build__ && cd __build__
-        - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES="static_assert;config" -DCMAKE_INSTALL_PREFIX=~/.local ..
+        - cmake -DBOOST_INCLUDE_LIBRARIES=static_assert -DCMAKE_INSTALL_PREFIX=~/.local ..
        - cmake --build . --target install
        - cd ../libs/static_assert/test/cmake_install_test && mkdir __build__ && cd __build__
        - cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -18,16 +18,6 @@ target_link_libraries(boost_static_assert
    Boost::config
 )

-# boost_install requires PROJECT_VERSION
-# Without the superproject, we don't have any, so skip installation
-
-if(BOOST_SUPERPROJECT_VERSION)
-
-  include(BoostInstall)
-  boost_install(TARGETS boost_static_assert HEADER_DIRECTORY include/)
-
-endif()
-
 # BUILD_TESTING is the standard CTest variable that enables testing

 if(BUILD_TESTING)
--- a/include/boost/static_assert.hpp
+++ b/include/boost/static_assert.hpp
@ -16,6 +16,7 @@

 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
+#include <cstddef> //for std::size_t

 #if defined(__GNUC__) && !defined(__GXX_EXPERIMENTAL_CXX0X__)
 //
@ -81,7 +82,7 @@ template <bool x> struct STATIC_ASSERTION_FAILURE;
 template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };

 // HP aCC cannot deal with missing names for template value parameters
-template<int x> struct static_assert_test{};
+template<std::size_t x> struct static_assert_test{};

 }

--- a/meta/libraries.json
+++ b/meta/libraries.json
@ -12,5 +12,6 @@
    ],
    "maintainers": [
        "John Maddock <john -at- johnmaddock.co.uk>"
-    ]
+    ],
+    "cxxstd": "03"
 }
Author	SHA1	Message	Date
jzmaddock	ba72d3340f	Merge pull request #16 from igaztanaga/patch-1 Small fix for Wsign-conversion	2021-10-13 16:03:23 +01:00
Ion Gaztañaga	803b983da7	Small fix for Wsign-conversion	2021-10-13 15:10:36 +02:00
Peter Dimov	392199f6b1	Fix CMake tests in .travis.yml	2021-06-10 16:34:02 +03:00
Peter Dimov	482e81cddd	Update CMakeLists.txt	2021-06-10 02:06:15 +03:00
jzmaddock	66db74297a	Merge pull request #13 from eldiener/develop [skip ci] Add "cxxstd" json field	2021-01-21 18:01:26 +00:00
Edward Diener	e9ab97859d	[skip ci] Add "cxxstd" json field. The "cxxstd" json field is being added to each Boost library's meta json information for libraries in order to specify the minumum C++ standard compilation level. The value of this field matches one of the values for 'cxxstd' in Boost.Build. The purpose of doing this is to provide information for the Boost website documentation for each library which will specify the minimum C++ standard compilation that an end-user must employ in order to use the particular library. This will aid end-users who want to know if they can successfully use a Boost library based on their C++ compiler's compilation level, without having to search the library's documentation to find this out.	2021-01-21 11:09:31 -05:00