Skip to content

Commit 2689462

Browse files
FlamefireFlamefire
committed
Merge branch 'develop'
2 parents 1a50e93 + fed43a6 commit 2689462

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+245
-337
lines changed

‎.appveyor.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Copyright 2016, 2017 Peter Dimov
22
# Copyright 2017 - 2019 James E. King III
33
# Copyright 2019 - 2022 Alexander Grund
4+
#
45
# Distributed under the Boost Software License, Version 1.0.
5-
# (See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt)
6+
# https://www.boost.org/LICENSE_1_0.txt
67

78
version: 1.0.{build}-{branch}
89

@@ -27,7 +28,7 @@ environment:
2728
global:
2829
B2_CI_VERSION: 1
2930
GIT_FETCH_JOBS: 4
30-
# see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
31+
# see: https://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
3132
# to use the default for a given environment, comment it out; recommend you build debug and release however:
3233
# on Windows it is important to exercise all the possibilities, especially shared vs static, however most
3334
# libraries that care about this exercise it in their Jamfiles...

‎.azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright 2019 Mateusz Loskot <mateusz at loskot dot net>
44
# Copyright 2020-2021 Alexander Grund
55
# Distributed under the Boost Software License, Version 1.0.
6-
# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
6+
# https://www.boost.org/LICENSE_1_0.txt
77

88
#
99
# Generic Azure Pipelines build script for boostorg repositories

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
# Copyright 2022 James E. King III
55
#
66
# Distributed under the Boost Software License, Version 1.0.
7-
# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
7+
# https://www.boost.org/LICENSE_1_0.txt
8+
89
---
910
name: CI
1011

‎.github/workflows/ci_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright 2019 - 2022 Alexander Grund
22
# Distributed under the Boost Software License, Version 1.0.
3-
# (See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt)
3+
# https://www.boost.org/LICENSE_1_0.txt
44

55
name: CI Tests
66

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright 2019 - 2020 Alexander Grund
22
# Distributed under the Boost Software License, Version 1.0.
3-
# (See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt)
3+
# https://www.boost.org/LICENSE_1_0.txt
44

55
on:
66
push:

‎.github/workflows/update_standalone.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright 2019 - 2021 Alexander Grund
22
# Distributed under the Boost Software License, Version 1.0.
3-
# (See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt)
3+
# https://www.boost.org/LICENSE_1_0.txt
44

55
on:
66
push:

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright 2019 - 2020 Alexander Grund
22
# Distributed under the Boost Software License, Version 1.0.
3-
# (See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt)
3+
# https://www.boost.org/LICENSE_1_0.txt
44

55
# Builds the libraries for Boost.Nowide
66
#

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
Branch | Appveyor | Github | codecov.io | Deps | Docs | Tests |
44
------------|----------|--------|------------| ---- | ---- | ----- |
5-
[master](https://github.com/boostorg/nowide/tree/master) | [![Build status](https://ci.appveyor.com/api/projects/status/w5sywrekwd66say4/branch/master?svg=true)](https://ci.appveyor.com/project/Flamefire/nowide-fr98b/branch/master) | ![](https://github.com/boostorg/nowide/workflows/CI%20Tests/badge.svg?branch=master) ![](https://github.com/boostorg/nowide/workflows/POSIX/badge.svg?branch=master) | [![codecov](https://codecov.io/gh/boostorg/nowide/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/nowide/branch/master) | [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/nowide.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://www.boost.org/doc/libs/master/libs/nowide/index.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/nowide.html)
6-
[develop](https://github.com/boostorg/nowide/tree/develop) | [![Build status](https://ci.appveyor.com/api/projects/status/w5sywrekwd66say4/branch/develop?svg=true)](https://ci.appveyor.com/project/Flamefire/nowide-fr98b/branch/develop) | ![](https://github.com/boostorg/nowide/workflows/CI%20Tests/badge.svg?branch=develop) ![](https://github.com/boostorg/nowide/workflows/POSIX/badge.svg?branch=develop) | [![codecov](https://codecov.io/gh/boostorg/nowide/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/nowide/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/nowide.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](https://www.boost.org/doc/libs/develop/libs/nowide/index.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/nowide.html)
5+
[master](https://github.com/boostorg/nowide/tree/master) | [![Build status](https://ci.appveyor.com/api/projects/status/w5sywrekwd66say4/branch/master?svg=true)](https://ci.appveyor.com/project/Flamefire/nowide-fr98b/branch/master) | ![](https://github.com/boostorg/nowide/workflows/CI%20Tests/badge.svg?branch=master) ![](https://github.com/boostorg/nowide/workflows/POSIX/badge.svg?branch=master) | [![codecov](https://codecov.io/gh/boostorg/nowide/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/nowide/branch/master) | [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/nowide.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://www.boost.org/doc/libs/master/libs/nowide/index.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](https://www.boost.org/development/tests/master/developer/nowide.html)
6+
[develop](https://github.com/boostorg/nowide/tree/develop) | [![Build status](https://ci.appveyor.com/api/projects/status/w5sywrekwd66say4/branch/develop?svg=true)](https://ci.appveyor.com/project/Flamefire/nowide-fr98b/branch/develop) | ![](https://github.com/boostorg/nowide/workflows/CI%20Tests/badge.svg?branch=develop) ![](https://github.com/boostorg/nowide/workflows/POSIX/badge.svg?branch=develop) | [![codecov](https://codecov.io/gh/boostorg/nowide/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/nowide/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/nowide.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](https://www.boost.org/doc/libs/develop/libs/nowide/index.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](https://www.boost.org/development/tests/develop/developer/nowide.html)
77

88
Quality checks:
99
[![Coverity Scan Build Status](https://scan.coverity.com/projects/20464/badge.svg)](https://scan.coverity.com/projects/boostorg-nowide)
@@ -15,7 +15,7 @@ The library provides an implementation of standard C and C++ library functions,
1515

1616
### License
1717

18-
Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt).
18+
Distributed under the [Boost Software License, Version 1.0](https://www.boost.org/LICENSE_1_0.txt).
1919

2020
### Properties
2121

@@ -104,5 +104,5 @@ Boost.Nowide integrates with Boost.Filesystem:
104104

105105
* [Ask questions](http://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-nowide)
106106
* [Report bugs](https://github.com/boostorg/nowide/issues): Be sure to mention Boost version, platform and compiler you're using. A small compilable code sample to reproduce the problem is always good as well.
107-
* Submit your patches as pull requests against **develop** branch. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt).
108-
* Discussions about the library are held on the [Boost developers mailing list](http://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](http://www.boost.org/community/policy.html) before posting and add the `[nowide]` tag at the beginning of the subject line.
107+
* Submit your patches as pull requests against **develop** branch. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](https://www.boost.org/LICENSE_1_0.txt).
108+
* Discussions about the library are held on the [Boost developers mailing list](https://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](https://www.boost.org/community/policy.html) before posting and add the `[nowide]` tag at the beginning of the subject line.

‎build/Jamfile.v2‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
# Boost Nowide Library Build Jamfile
2-
31
# Copyright (c) 2002, 2006 Beman Dawes
42
# Copyright (c) 2012 Artyom Beilis (Tonkikh)
53
# Copyright (c) 2020-2021 Alexander Grund
64
#
75
# Distributed under the Boost Software License, Version 1.0.
8-
# (See accompanying file LICENSE or www.boost.org/LICENSE_1_0.txt)
9-
# See library home page at http://www.boost.org/libs/nowide
6+
# https://www.boost.org/LICENSE_1_0.txt
7+
#
8+
# See library home page at https://www.boost.org/libs/nowide
109

1110
import ../../config/checks/config : requires ;
1211
import configure ;

‎config/check_attribute_init_priority.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
// Copyright (c) 2021 Alexander Grund
2-
//
3-
// Distributed under the Boost Software License, Version 1.0. (See
4-
// accompanying file LICENSE or copy at http://www.boost.org/LICENSE.txt)
1+
// Copyright (c) 2021 Alexander Grund
52
//
3+
// Distributed under the Boost Software License, Version 1.0.
4+
// https://www.boost.org/LICENSE_1_0.txt
65

76
class Foo
87
{};

0 commit comments

Comments
 (0)