Skip to content

Commit

Permalink
Apply Standard [FILE.LICENCE_ID] rule
Browse files Browse the repository at this point in the history
  • Loading branch information
neatudarius committed Jun 23, 2024
1 parent f4eaa88 commit df767d5
Show file tree
Hide file tree
Showing 25 changed files with 79 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# -*-makefile-*-
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

cmake_minimum_required(VERSION 3.10)

project(beman_optional26 VERSION 0.0.0 LANGUAGES CXX)
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#! /usr/bin/make -f
# -*-makefile-*-
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

INSTALL_PREFIX?=.install/
PROJECT?=$(shell basename $(CURDIR))
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ This implementation incorporates the C++26 extensions added for `std::optional`.
* [`std::optional<T&>` (P2988R5)](https://wg21.link/P2988R5)
* [Give *std::optional* Range Support (P3168R1)](https://wg21.link/P3168R1).

## License

Source is licensed with the Apache 2.0 license with LLVM exceptions

Expand Down
3 changes: 3 additions & 0 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# -*-makefile-*-
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

set(BEMAN_OPTIONAL26_LIBRARY "beman_optional26")

include(GNUInstallDirs)
Expand Down
15 changes: 15 additions & 0 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@

List of usage examples for `Beman.Optional26`.

## License
Source is licensed with the Apache 2.0 license with LLVM exceptions

// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

Documentation and associated papers are licensed with the Creative Commons Attribution 4.0 International license.

// SPDX-License-Identifier: CC-BY-4.0

The intent is that the source and documentation are available for use by people implementing their own optional types as well as people using the optional presented here as-is.

The README itself is licesed with CC0 1.0 Universal. Copy the contents and incorporate in your own work as you see fit.

// SPDX-License-Identifier: CC0-1.0

## Sample

Check [sample](sample.cpp) for basic `Beman.Optional26` library usage.
Expand Down
3 changes: 3 additions & 0 deletions examples/optional_ref.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// examples/optional_ref.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>

#include <string>
Expand Down
3 changes: 3 additions & 0 deletions examples/range_loop.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// examples/range_loop.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>
#include <iostream>

Expand Down
3 changes: 3 additions & 0 deletions examples/sample.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// examples/sample.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>
#include <iostream>

Expand Down
4 changes: 3 additions & 1 deletion include/Beman/Optional26/detail/iterator.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// include/Beman/Optional26/detail/iterator.hpp -*-C++-*-
// include/Beman/Optional26/detail/iterator.hpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#ifndef BEMAN_OPTIONAL26_DETAIL_ITERATOR_HPP
#define BEMAN_OPTIONAL26_DETAIL_ITERATOR_HPP

Expand Down
3 changes: 2 additions & 1 deletion include/Beman/Optional26/detail/stl_interfaces/config.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// include/Beman/Optional26/detail/stl_interfaces/config.hpp -*-C++-*-
// include/Beman/Optional26/detail/stl_interfaces/config.hpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

// Copyright (C) 2020 T. Zachary Laine
//
Expand Down
3 changes: 2 additions & 1 deletion include/Beman/Optional26/detail/stl_interfaces/fwd.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// include/Beman/Optional26/detail/stl_interfaces/fwd.hpp -*-C++-*-
// include/Beman/Optional26/detail/stl_interfaces/fwd.hpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

// Copyright (C) 2019 T. Zachary Laine
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// include/Beman/Optional26/detail/stl_interfaces/iterator_interface.hpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

// Copyright (C) 2019 T. Zachary Laine
//
Expand Down
4 changes: 3 additions & 1 deletion include/Beman/Optional26/optional.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// include/Beman/Optional26/optional.hpp -*-C++-*-
// include/Beman/Optional26/optional.hpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#ifndef BEMAN_OPTIONAL26_OPTIONAL_HPP
#define BEMAN_OPTIONAL26_OPTIONAL_HPP

Expand Down
3 changes: 3 additions & 0 deletions src/Beman/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# -*-makefile-*-
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

add_subdirectory(Optional26)
3 changes: 3 additions & 0 deletions src/Beman/Optional26/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# -*-makefile-*-
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

set(TARGET_LIBRARY "beman_optional26")

add_library("${TARGET_LIBRARY}" STATIC "")
Expand Down
3 changes: 3 additions & 0 deletions src/Beman/Optional26/detail/iterator.cpp
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
// src/Beman/Optional26/detail/iterator.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/detail/iterator.hpp>
3 changes: 3 additions & 0 deletions src/Beman/Optional26/optional.cpp
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
// src/Beman/Optional26/optional.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>
3 changes: 3 additions & 0 deletions src/Beman/Optional26/tests/detail/iterator.t.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// src/Beman/Optional26/tests/detail/iterator.t.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

/**
* This file contains tests for beman::optional::detail::contiguous_iterator.
*/
Expand Down
3 changes: 3 additions & 0 deletions src/Beman/Optional26/tests/optional.t.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// src/Beman/Optional26/tests/optional.t.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>

#include <Beman/Optional26/optional.hpp> // test 2nd include OK
Expand Down
3 changes: 3 additions & 0 deletions src/Beman/Optional26/tests/optional_monadic.t.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// src/Beman/Optional26/tests/optional_monadic.t.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>

#include <gtest/gtest.h>
Expand Down
3 changes: 3 additions & 0 deletions src/Beman/Optional26/tests/optional_range_support.t.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// src/Beman/Optional26/tests/optional_range_support.t.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

/**
* This file contains tests for the range support. Check P3168R1: "Give std::optional Range Support".
*
Expand Down
3 changes: 3 additions & 0 deletions src/Beman/Optional26/tests/optional_ref.t.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// src/Beman/Optional26/tests/optional_ref.t.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>

#include <gtest/gtest.h>
Expand Down
3 changes: 3 additions & 0 deletions src/Beman/Optional26/tests/optional_ref_monadic.t.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// src/Beman/Optional26/tests/optional_ref_monadic.t.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>

#include <gtest/gtest.h>
Expand Down
3 changes: 3 additions & 0 deletions src/Beman/Optional26/tests/test_types.hpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// src/Beman/Optional26/tests/test_types.h -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#ifndef BEMAN_OPTIONAL26_TESTS_TEST_TYPES_HPP
#define BEMAN_OPTIONAL26_TESTS_TEST_TYPES_HPP

Expand Down
3 changes: 3 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# -*-makefile-*-
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

add_subdirectory(Beman)

0 comments on commit df767d5

Please sign in to comment.