Update copyright notices

CMakeLists.txt

@@ -1,5 +1,5 @@
-# Copyright (C) 2017-2018 Jonathan Müller <jonathanmueller.dev@gmail.com>
+# Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-# This file is subject to the license terms in the LICENSE file
+# SPDX-License-Identifier: MIT
 # found in the top-level directory of this distribution.
 
 cmake_minimum_required(VERSION 3.11)

example/CMakeLists.txt

@@ -1,5 +1,5 @@
-# Copyright (C) 2017-2018 Jonathan Müller <jonathanmueller.dev@gmail.com>
+# Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-# This file is subject to the license terms in the LICENSE file
+# SPDX-License-Identifier: MIT
 # found in the top-level directory of this distribution.
 
 function(_cppast_example name)

example/ast_printer.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 /// \file
 /// This is a very primitive version of the cppast tool.

example/comparison.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 /// \file
 /// Generate equality comparisons.
@@ -80,13 +79,12 @@ void generate_op_non_equal(std::ostream& out, const cppast::cpp_class& c)
 // generate comparison operators for all classes in the file
 void generate_comparison(const cppast::cpp_file& file)
 {
-    cppast::visit(file,
+    cppast::visit(
+        file,
         [](const cppast::cpp_entity& e) {
             // only visit non-templated class definitions that have the attribute set
-                      return (!cppast::is_templated(e)
+            return (!cppast::is_templated(e) && e.kind() == cppast::cpp_entity_kind::class_t
-                              && e.kind() == cppast::cpp_entity_kind::class_t
+                    && cppast::is_definition(e) && cppast::has_attribute(e, "generate::comparison"))
-                              && cppast::is_definition(e)
-                              && cppast::has_attribute(e, "generate::comparison"))
                    // or all namespaces
                    || e.kind() == cppast::cpp_entity_kind::namespace_t;
         },
@@ -95,8 +93,7 @@ void generate_comparison(const cppast::cpp_file& file)
             {
                 // it is a new class
                 auto& class_    = static_cast<const cppast::cpp_class&>(e);
-                          auto& attribute
+                auto& attribute = cppast::has_attribute(e, "generate::comparison").value();
-                              = cppast::has_attribute(e, "generate::comparison").value();
 
                 // generate requested operators
                 if (attribute.arguments())

example/documentation_generator.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 /// \file
 /// A primitive documentation generator.
@@ -120,7 +119,8 @@ std::string generate_synopsis(const cppast::cpp_entity& e)
 void generate_documentation(const cppast::cpp_file& file)
 {
     // visit each entity
-    cppast::visit(file,
+    cppast::visit(
+        file,
         [](const cppast::cpp_entity& e, cppast::cpp_access_specifier_kind access) {
             if (is_excluded_documentation(e, access))
                 // exclude this and all children
@@ -137,8 +137,7 @@ void generate_documentation(const cppast::cpp_file& file)
                 return;
 
             // print name
-                      std::cout << "## " << cppast::to_string(e.kind()) << " '" << e.name()
+            std::cout << "## " << cppast::to_string(e.kind()) << " '" << e.name() << "'\n";
-                                << "'\n";
             std::cout << '\n';
 
             // print synopsis

example/enum_category.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 /// \file
 /// Generates enum category functions.
@@ -55,11 +54,11 @@ const cppast::cpp_enum& get_enum(const cppast::cpp_entity_index&       index,
 // generates the function definitions
 void generate_enum_category(const cppast::cpp_entity_index& index, const cppast::cpp_file& file)
 {
-    cppast::visit(file,
+    cppast::visit(
+        file,
         [](const cppast::cpp_entity& e) {
             // only visit function declarations that have the attribute set
-                      return (e.kind() == cppast::cpp_entity_kind::function_t
+            return (e.kind() == cppast::cpp_entity_kind::function_t && !cppast::is_definition(e)
-                              && !cppast::is_definition(e)
                     && cppast::has_attribute(e, "generate::enum_category"))
                    // or all namespaces
                    || e.kind() == cppast::cpp_entity_kind::namespace_t;
@@ -89,15 +88,14 @@ void generate_enum_category(const cppast::cpp_entity_index& index, const cppast:
                 auto& enum_ = get_enum(index, param);
 
                 // generate function definition
-                          std::cout << "inline bool " << func.name() << "("
+                std::cout << "inline bool " << func.name() << "(" << cppast::to_string(param.type())
-                                    << cppast::to_string(param.type()) << " e) {\n";
+                          << " e) {\n";
 
                 // generate switch
                 std::cout << "  switch (e) {\n";
                 for (const auto& enumerator : enum_)
                 {
-                              std::cout << "  case " << enum_.name() << "::" << enumerator.name()
+                    std::cout << "  case " << enum_.name() << "::" << enumerator.name() << ":\n";
-                                        << ":\n";
                     if (is_category(enumerator, category))
                         std::cout << "    return true;\n";
                     else

example/enum_to_string.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 /// \file
 /// Generates enum `to_string()` code.
@@ -17,11 +16,11 @@
 
 void generate_to_string(const cppast::cpp_file& file)
 {
-    cppast::visit(file,
+    cppast::visit(
+        file,
         [](const cppast::cpp_entity& e) {
             // only visit enum definitions that have the attribute set
-                      return (e.kind() == cppast::cpp_entity_kind::enum_t
+            return (e.kind() == cppast::cpp_entity_kind::enum_t && cppast::is_definition(e)
-                              && cppast::is_definition(e)
                     && cppast::has_attribute(e, "generate::to_string"))
                    // or all namespaces
                    || e.kind() == cppast::cpp_entity_kind::namespace_t;
@@ -33,21 +32,17 @@ void generate_to_string(const cppast::cpp_file& file)
                 auto& enum_ = static_cast<const cppast::cpp_enum&>(e);
 
                 // write function header
-                          std::cout << "inline const char* to_string(const " << enum_.name()
+                std::cout << "inline const char* to_string(const " << enum_.name() << "& e) {\n";
-                                    << "& e) {\n";
 
                 // generate switch
                 std::cout << "  switch (e) {\n";
                 for (const auto& enumerator : enum_)
                 {
-                              std::cout << "  case " << enum_.name() << "::" << enumerator.name()
+                    std::cout << "  case " << enum_.name() << "::" << enumerator.name() << ":\n";
-                                        << ":\n";
 
                     // attribute can be used to override the string
-                              if (auto attr
+                    if (auto attr = cppast::has_attribute(enumerator, "generate::to_string"))
-                                  = cppast::has_attribute(enumerator, "generate::to_string"))
+                        std::cout << "    return " << attr.value().arguments().value().as_string()
-                                  std::cout << "    return "
-                                            << attr.value().arguments().value().as_string()
                                   << ";\n";
                     else
                         std::cout << "    return \"" << enumerator.name() << "\";\n";

example/example_parser.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_EXAMPLE_PARSER_HPP_INCLUDED
 #define CPPAST_EXAMPLE_PARSER_HPP_INCLUDED
@@ -13,7 +12,8 @@
 // parses all files in that directory
 // and invokes the callback for each of them
 template <typename Callback>
-int example_main(int argc, char* argv[], const cppast::cpp_entity_index& index, Callback cb) try
+int example_main(int argc, char* argv[], const cppast::cpp_entity_index& index, Callback cb)
+try
 {
     if (argc != 2)
     {

example/serialization.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 /// \file
 /// Serialization code generation.
@@ -69,13 +68,12 @@ void generate_serialize_member(std::ostream& out, const cppast::cpp_member_varia
 // generate serialization function
 void generate_serialize(const cppast::cpp_file& file)
 {
-    cppast::visit(file,
+    cppast::visit(
+        file,
         [](const cppast::cpp_entity& e) {
             // only visit non-templated class definitions that have the attribute set
-                      return (!cppast::is_templated(e)
+            return (!cppast::is_templated(e) && e.kind() == cppast::cpp_entity_kind::class_t
-                              && e.kind() == cppast::cpp_entity_kind::class_t
+                    && cppast::is_definition(e) && cppast::has_attribute(e, "generate::serialize"))
-                              && cppast::is_definition(e)
-                              && cppast::has_attribute(e, "generate::serialize"))
                    // or all namespaces
                    || e.kind() == cppast::cpp_entity_kind::namespace_t;
         },
@@ -98,8 +96,7 @@ void generate_serialize(const cppast::cpp_file& file)
                 {
                     if (member.kind() == cppast::cpp_entity_kind::member_variable_t)
                         generate_serialize_member(std::cout,
-                                                            static_cast<
+                                                  static_cast<const cppast::cpp_member_variable&>(
-                                                                const cppast::cpp_member_variable&>(
                                                       member));
                 }
 

external/external.cmake

@@ -1,5 +1,5 @@
 # Copyright (C) 2017 Jonathan Müller <jonathanmueller.dev@gmail.com>
-# This file is subject to the license terms in the LICENSE file
+# SPDX-License-Identifier: MIT
 # found in the top-level directory of this distribution.
 
 include(FetchContent)

include/cppast/code_generator.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CODE_GENERATOR_HPP_INCLUDED
 #define CPPAST_CODE_GENERATOR_HPP_INCLUDED

include/cppast/compile_config.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_COMPILE_CONFIG_HPP_INCLUDED
 #define CPPAST_COMPILE_CONFIG_HPP_INCLUDED
@@ -11,8 +10,8 @@
 #include <type_safe/flag_set.hpp>
 #include <type_safe/reference.hpp>
 
-#include <cppast/detail/assert.hpp>
 #include <cppast/cppast_fwd.hpp>
+#include <cppast/detail/assert.hpp>
 
 namespace cppast
 {

include/cppast/cpp_alias_template.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_ALIAS_TEMPLATE_HPP_INCLUDED
 #define CPPAST_CPP_ALIAS_TEMPLATE_HPP_INCLUDED

include/cppast/cpp_array_type.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_ARRAY_TYPE_HPP_INCLUDED
 #define CPPAST_CPP_ARRAY_TYPE_HPP_INCLUDED

include/cppast/cpp_attribute.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_ATTRIBUTE_HPP_INCLUDED
 #define CPPAST_CPP_ATTRIBUTE_HPP_INCLUDED

include/cppast/cpp_class.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_CLASS_HPP_INCLUDED
 #define CPPAST_CPP_CLASS_HPP_INCLUDED

include/cppast/cpp_class_template.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_CLASS_TEMPLATE_HPP_INCLUDED
 #define CPPAST_CPP_CLASS_TEMPLATE_HPP_INCLUDED

include/cppast/cpp_decltype_type.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_DECLTYPE_TYPE_HPP_INCLUDED
 #define CPPAST_CPP_DECLTYPE_TYPE_HPP_INCLUDED

include/cppast/cpp_entity.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_ENTITY_HPP_INCLUDED
 #define CPPAST_CPP_ENTITY_HPP_INCLUDED

include/cppast/cpp_entity_container.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_ENTITY_CONTAINER_HPP_INCLUDED
 #define CPPAST_CPP_ENTITY_CONTAINER_HPP_INCLUDED

include/cppast/cpp_entity_index.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_ENTITY_INDEX_HPP_INCLUDED
 #define CPPAST_CPP_ENTITY_INDEX_HPP_INCLUDED
@@ -104,8 +103,8 @@ public:
     /// \returns A [ts::optional_ref]() corresponding to the entity of the given
     /// [cppast::cpp_entity_id](). If no definition has been registered, it returns an empty
     /// optional. \notes This operation is thread safe.
-    type_safe::optional_ref<const cpp_entity> lookup_definition(const cpp_entity_id& id) const
+    type_safe::optional_ref<const cpp_entity> lookup_definition(
-        noexcept;
+        const cpp_entity_id& id) const noexcept;
 
     /// \returns A [ts::array_ref]() of references to all namespaces matching the given
     /// [cppast::cpp_entity_id](). If no namespace is found, it returns an empty array reference.

include/cppast/cpp_entity_kind.hpp

@@ -1,12 +1,11 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_ENTITY_KIND_HPP_INCLUDED
 #define CPPAST_CPP_ENTITY_KIND_HPP_INCLUDED
 
-#include <cppast/detail/assert.hpp>
 #include <cppast/cppast_fwd.hpp>
+#include <cppast/detail/assert.hpp>
 
 namespace cppast
 {

include/cppast/cpp_entity_ref.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_ENTITY_REF_HPP_INCLUDED
 #define CPPAST_CPP_ENTITY_REF_HPP_INCLUDED

include/cppast/cpp_enum.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_ENUM_HPP_INCLUDED
 #define CPPAST_CPP_ENUM_HPP_INCLUDED

include/cppast/cpp_expression.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_EXPRESSION_HPP_INCLUDED
 #define CPPAST_CPP_EXPRESSION_HPP_INCLUDED

include/cppast/cpp_file.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_FILE_HPP_INCLUDED
 #define CPPAST_CPP_FILE_HPP_INCLUDED

include/cppast/cpp_forward_declarable.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_FORWARD_DECLARABLE_HPP_INCLUDED
 #define CPPAST_CPP_FORWARD_DECLARABLE_HPP_INCLUDED

include/cppast/cpp_friend.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_FRIEND_HPP_INCLUDED
 #define CPPAST_CPP_FRIEND_HPP_INCLUDED

include/cppast/cpp_function.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_FUNCTION_HPP_INCLUDED
 #define CPPAST_CPP_FUNCTION_HPP_INCLUDED

include/cppast/cpp_function_template.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_FUNCTION_TEMPLATE_HPP_INCLUDED
 #define CPPAST_CPP_FUNCTION_TEMPLATE_HPP_INCLUDED

include/cppast/cpp_function_type.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_FUNCTION_TYPE_HPP_INCLUDED
 #define CPPAST_CPP_FUNCTION_TYPE_HPP_INCLUDED

include/cppast/cpp_language_linkage.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_LANGUAGE_LINKAGE_HPP_INCLUDED
 #define CPPAST_CPP_LANGUAGE_LINKAGE_HPP_INCLUDED

include/cppast/cpp_member_function.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_MEMBER_FUNCTION_HPP_INCLUDED
 #define CPPAST_CPP_MEMBER_FUNCTION_HPP_INCLUDED

include/cppast/cpp_member_variable.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_MEMBER_VARIABLE_HPP_INCLUDED
 #define CPPAST_CPP_MEMBER_VARIABLE_HPP_INCLUDED

include/cppast/cpp_namespace.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_NAMESPACE_HPP_INCLUDED
 #define CPPAST_CPP_NAMESPACE_HPP_INCLUDED

include/cppast/cpp_preprocessor.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_PREPROCESSOR_HPP_INCLUDED
 #define CPPAST_CPP_PREPROCESSOR_HPP_INCLUDED

include/cppast/cpp_static_assert.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_STATIC_ASSERT_HPP_INCLUDED
 #define CPPAST_CPP_STATIC_ASSERT_HPP_INCLUDED

include/cppast/cpp_storage_class_specifiers.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_STORAGE_CLASS_SPECIFIERS_HPP_INCLUDED
 #define CPPAST_CPP_STORAGE_CLASS_SPECIFIERS_HPP_INCLUDED

include/cppast/cpp_template.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_TEMPLATE_HPP_INCLUDED
 #define CPPAST_CPP_TEMPLATE_HPP_INCLUDED
@@ -143,8 +142,8 @@ public:
 
     /// \returns An array ref to the [cppast::cpp_template_argument](), if there are any.
     /// \requires The arguments are exposed, i.e. `arguments_exposed()` returns `true`.
-    type_safe::optional<type_safe::array_ref<const cpp_template_argument>> arguments() const
+    type_safe::optional<type_safe::array_ref<const cpp_template_argument>> arguments()
-        noexcept
+        const noexcept
     {
         auto& vec = arguments_.value(type_safe::variant_type<std::vector<cpp_template_argument>>{});
         if (vec.empty())

include/cppast/cpp_template_parameter.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_TEMPLATE_PARAMETER_HPP_INCLUDED
 #define CPPAST_CPP_TEMPLATE_PARAMETER_HPP_INCLUDED

include/cppast/cpp_token.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_TOKEN_HPP_INCLUDED
 #define CPPAST_CPP_TOKEN_HPP_INCLUDED

include/cppast/cpp_type.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_TYPE_HPP_INCLUDED
 #define CPPAST_CPP_TYPE_HPP_INCLUDED

include/cppast/cpp_type_alias.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_TYPE_ALIAS_HPP_INCLUDED
 #define CPPAST_CPP_TYPE_ALIAS_HPP_INCLUDED

include/cppast/cpp_variable.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_VARIABLE_HPP_INCLUDED
 #define CPPAST_CPP_VARIABLE_HPP_INCLUDED

include/cppast/cpp_variable_base.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_VARIABLE_BASE_HPP_INCLUDED
 #define CPPAST_CPP_VARIABLE_BASE_HPP_INCLUDED

include/cppast/cpp_variable_template.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CPP_VARIABLE_TEMPLATE_HPP_INCLUDED
 #define CPPAST_CPP_VARIABLE_TEMPLATE_HPP_INCLUDED

include/cppast/cppast_fwd.hpp

@@ -1,6 +1,5 @@
 // Copyright (C) 2021 Julian Rüth <julian.rueth@fsfe.org>
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_FORWARD_HPP_INCLUDED
 #define CPPAST_FORWARD_HPP_INCLUDED
@@ -118,9 +117,12 @@ struct source_location;
 struct visitor_info;
 struct whitespace_t;
 
-template <class Derived, typename T> class cpp_entity_container;
+template <class Derived, typename T>
-template <class Parser> class simple_file_parser;
+class cpp_entity_container;
-template <typename T, typename Predicate> class basic_cpp_entity_ref;
+template <class Parser>
+class simple_file_parser;
+template <typename T, typename Predicate>
+class basic_cpp_entity_ref;
 
 } // namespace cppast
 

include/cppast/detail/assert.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_ASSERT_HPP_INCLUDED
 #define CPPAST_ASSERT_HPP_INCLUDED

include/cppast/detail/intrusive_list.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_INTRUSIVE_LIST_HPP_INCLUDED
 #define CPPAST_INTRUSIVE_LIST_HPP_INCLUDED
@@ -10,8 +9,8 @@
 
 #include <type_safe/optional_ref.hpp>
 
-#include <cppast/detail/assert.hpp>
 #include <cppast/cppast_fwd.hpp>
+#include <cppast/detail/assert.hpp>
 
 namespace cppast
 {

include/cppast/diagnostic.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_DIAGNOSTIC_HPP_INCLUDED
 #define CPPAST_DIAGNOSTIC_HPP_INCLUDED

include/cppast/diagnostic_logger.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_DIAGNOSTIC_LOGGER_HPP_INCLUDED
 #define CPPAST_DIAGNOSTIC_LOGGER_HPP_INCLUDED

include/cppast/libclang_parser.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_LIBCLANG_PARSER_HPP_INCLUDED
 #define CPPAST_LIBCLANG_PARSER_HPP_INCLUDED

include/cppast/parser.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_PARSER_HPP_INCLUDED
 #define CPPAST_PARSER_HPP_INCLUDED

include/cppast/visitor.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_VISITOR_HPP_INCLUDED
 #define CPPAST_VISITOR_HPP_INCLUDED

src/CMakeLists.txt

@@ -1,5 +1,5 @@
-# Copyright (C) 2017-2018 Jonathan Müller <jonathanmueller.dev@gmail.com>
+# Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-# This file is subject to the license terms in the LICENSE file
+# SPDX-License-Identifier: MIT
 # found in the top-level directory of this distribution.
 
 set(detail_header

src/code_generator.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/code_generator.hpp>
 
@@ -292,10 +291,9 @@ bool generate_enum(code_generator& generator, const cpp_enum& e,
             output << opening_brace;
             output.indent();
 
-            auto need_sep = write_container(output, e,
+            auto need_sep = write_container(
-                                            [](const code_generator::output& out) {
+                output, e,
-                                                out << punctuation(",") << newl;
+                [](const code_generator::output& out) { out << punctuation(",") << newl; },
-                                            },
                 cur_access);
             if (need_sep)
                 output << newl;

src/cpp_alias_template.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_alias_template.hpp>
 

src/cpp_attribute.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_attribute.hpp>
 

src/cpp_class.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_class.hpp>
 

src/cpp_class_template.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_class_template.hpp>
 

src/cpp_entity.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_entity.hpp>
 

src/cpp_entity_index.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_entity_index.hpp>
 

src/cpp_entity_kind.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_entity_kind.hpp>
 

src/cpp_enum.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_enum.hpp>
 

src/cpp_expression.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_expression.hpp>
 

src/cpp_file.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_file.hpp>
 

src/cpp_forward_declarable.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_forward_declarable.hpp>
 

src/cpp_friend.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_friend.hpp>
 

src/cpp_function.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_function.hpp>
 

src/cpp_function_template.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_function_template.hpp>
 

src/cpp_language_linkage.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_language_linkage.hpp>
 

src/cpp_member_function.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_member_function.hpp>
 

src/cpp_member_variable.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_member_variable.hpp>
 

src/cpp_namespace.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_namespace.hpp>
 

src/cpp_preprocessor.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_preprocessor.hpp>
 

src/cpp_static_assert.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_static_assert.hpp>
 

src/cpp_template_parameter.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_template_parameter.hpp>
 

src/cpp_token.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_token.hpp>
 

src/cpp_type.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_type.hpp>
 

src/cpp_type_alias.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_type_alias.hpp>
 

src/cpp_variable.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_variable.hpp>
 

src/cpp_variable_template.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_variable_template.hpp>
 

src/diagnostic_logger.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/diagnostic_logger.hpp>
 

src/libclang/class_parser.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <clang-c/Index.h>
 #include <cppast/cpp_class.hpp>

src/libclang/cxtokenizer.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include "cxtokenizer.hpp"
 

src/libclang/cxtokenizer.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_CXTOKENIZER_HPP_INCLUDED
 #define CPPAST_CXTOKENIZER_HPP_INCLUDED

src/libclang/debug_helper.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include "debug_helper.hpp"
 

src/libclang/debug_helper.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_DEBUG_HELPER_HPP_INCLUDED
 #define CPPAST_DEBUG_HELPER_HPP_INCLUDED

src/libclang/enum_parser.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_enum.hpp>
 

src/libclang/expression_parser.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_expression.hpp>
 

src/libclang/friend_parser.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_friend.hpp>
 

src/libclang/function_parser.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/cpp_function.hpp>
 #include <cppast/cpp_member_function.hpp>

src/libclang/language_linkage_parser.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include "parse_functions.hpp"
 

src/libclang/libclang_parser.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include <cppast/libclang_parser.hpp>
 

src/libclang/libclang_visitor.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_LIBCLANG_VISITOR_HPP_INCLUDED
 #define CPPAST_LIBCLANG_VISITOR_HPP_INCLUDED

src/libclang/namespace_parser.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include "parse_functions.hpp"
 

src/libclang/parse_error.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_PARSE_ERROR_HPP_INCLUDED
 #define CPPAST_PARSE_ERROR_HPP_INCLUDED

src/libclang/parse_functions.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include "parse_functions.hpp"
 
@@ -108,7 +107,8 @@ bool is_friend(const CXCursor& parent_cur)
 
 std::unique_ptr<cpp_entity> detail::parse_entity(const detail::parse_context& context,
                                                  cpp_entity* parent, const CXCursor& cur,
-                                                 const CXCursor& parent_cur) try
+                                                 const CXCursor& parent_cur)
+try
 {
     if (context.logger->is_verbose())
     {

src/libclang/parse_functions.hpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #ifndef CPPAST_PARSE_FUNCTIONS_HPP_INCLUDED
 #define CPPAST_PARSE_FUNCTIONS_HPP_INCLUDED

src/libclang/preprocessor.cpp

@@ -1,6 +1,5 @@
-// Copyright (C) 2017-2019 Jonathan Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2017-2022 Jonathan Müller and cppast contributors
-// This file is subject to the license terms in the LICENSE file
+// SPDX-License-Identifier: MIT
-// found in the top-level directory of this distribution.
 
 #include "preprocessor.hpp"