Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Install Ninja
uses: lukka/get-cmake@latest
with:
cmakeVersion: ~3.25.0
cmakeVersion: ~3.28.0
Copy link
Member Author

@JeffGarland JeffGarland Jul 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nickelpro this change is ok, but had to leave 3.25 in top level cmake

ninjaVersion: ^1.11.1
- name: Setup MSVC
if: startsWith(matrix.platform.os, 'windows')
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
- name: Setup build environment
uses: lukka/get-cmake@latest
with:
cmakeVersion: ~3.25.0
cmakeVersion: ~3.28.0
ninjaVersion: ^1.11.1
- name: Install Compiler
id: install-compiler
Expand Down
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

/.cache
/.vscode
/compile_commands.json
/build

# ignore emacs temp files
*~
\#*\#

# ignore vscode settings
.vscode
2 changes: 1 addition & 1 deletion include/beman/any_view/detail/any_iterator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#define BEMAN_ANY_VIEW_DETAIL_ANY_ITERATOR_HPP

#include <beman/any_view/concepts.hpp>
#include <beman/any_view/config.hpp>
#include <beman/any_view/detail/intrusive_small_ptr.hpp>
#include <beman/any_view/detail/iterator_adaptor.hpp>
#include <beman/any_view/detail/unique_address.hpp>

namespace beman::any_view::detail {

Expand Down
2 changes: 1 addition & 1 deletion include/beman/any_view/detail/iterator_adaptor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#ifndef BEMAN_ANY_VIEW_DETAIL_ITERATOR_ADAPTOR_HPP
#define BEMAN_ANY_VIEW_DETAIL_ITERATOR_ADAPTOR_HPP

#include <beman/any_view/config.hpp>
#include <beman/any_view/detail/concepts.hpp>
#include <beman/any_view/detail/iterator_interface.hpp>
#include <beman/any_view/detail/unique_address.hpp>
#include <beman/any_view/detail/utility.hpp>

#include <compare>
Expand Down
21 changes: 21 additions & 0 deletions include/beman/any_view/detail/unique_address.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#ifndef BEMAN_ANY_VIEW_DETAIL_UNIQUE_ADDRESS_HPP
#define BEMAN_ANY_VIEW_DETAIL_UNIQUE_ADDRESS_HPP

//clang-format off
#if !defined(__has_include) || __has_include(<beman/any_view/config.hpp>)
#include <beman/any_view/config.hpp>
#else
// if the config.hpp file does not exist because this is in godbolt
// or another context where cmake is not run, default to the correct
// answer.
#if (_MSC_VER)
#define BEMAN_ANY_VIEW_NO_UNIQUE_ADDRESS() [[msvc::no_unique_address]]
#else
#define BEMAN_ANY_VIEW_NO_UNIQUE_ADDRESS() [[no_unique_address]]
#endif
#endif
//clang-format on

#endif
2 changes: 1 addition & 1 deletion include/beman/any_view/detail/view_adaptor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#ifndef BEMAN_ANY_VIEW_DETAIL_VIEW_ADAPTOR_HPP
#define BEMAN_ANY_VIEW_DETAIL_VIEW_ADAPTOR_HPP

#include <beman/any_view/config.hpp>
#include <beman/any_view/detail/unique_address.hpp>
#include <beman/any_view/detail/view_interface.hpp>

namespace beman::any_view::detail {
Expand Down
Loading