Merge branch 'develop'

Author: Flamefire

.appveyor.yml

@@ -146,6 +146,10 @@ for:
     build_script: cmake --build . --config %configuration% --parallel 4
     test_script:
       - ctest --output-on-failure -C %configuration% --parallel 4
+      - ps: |
+            $iostream_exe = "$env:configuration/boost_nowide-test_iostream.exe"
+            # Should show "Using Nowide input/output" and run the tests
+            &$iostream_exe
       - ps: |
             If ($env:COVERAGE -eq "true") {
               choco install opencppcoverage

.clang-format

@@ -73,9 +73,12 @@ IncludeCategories:
   - Regex:           '<boost/nowide'
     Priority:        49
     SortPriority:    0
-  - Regex:           '<boost/'
+  - Regex:           '^"'
     Priority:        50
     SortPriority:    0
+  - Regex:           '<boost/'
+    Priority:        75
+    SortPriority:    0
   - Regex:           '^<'
     Priority:        100
     SortPriority:    0

.github/workflows/ci_tests.yml

@@ -82,6 +82,7 @@ jobs:
       run: cmake .. -DBoost_DEBUG=ON -DCMAKE_BUILD_TYPE=${{matrix.buildType}} -DBUILD_SHARED_LIBS=${{matrix.shared_lib}} -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/../install -G "${{matrix.generator}}" -DCMAKE_SH="CMAKE_SH-NOTFOUND" -DBoost_NO_BOOST_CMAKE=ON
     - name: Build & Install
       run: cmake --build build --config ${{matrix.buildType}} --target install
+
     # Run test with both bash and powershell and watch for "Using std::cin" on bash but not on powershell
     - name: Test
       working-directory: build
@@ -179,7 +180,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - uses: DoozyX/clang-format-lint-action@v0.10
+    - uses: DoozyX/clang-format-lint-action@v0.11
       with:
         exclude: './doc'
         clangFormatVersion: 10

.github/workflows/posix.yml

@@ -16,7 +16,6 @@ env:
 jobs:
   CI:
     strategy:
-      fail-fast: false
       matrix:
         include:
           - { compiler: g++-4.4,        cxxstd: '98,0x',                         os: ubuntu-16.04, install: yes }
@@ -60,7 +59,8 @@ jobs:
 
       - name: Setup config vars
         run: |
-          echo "LIBRARY=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV
+          LIBRARY=${GITHUB_REPOSITORY#*/}
+          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
           echo "B2_COMPILER=${{matrix.compiler}}" >> $GITHUB_ENV
           ${{matrix.compiler}} --version
           if [[ "${{matrix.compiler}}" =~ clang ]]; then
@@ -76,7 +76,7 @@ jobs:
           echo "B2_CXXSTD=${{matrix.cxxstd}}" >> $GITHUB_ENV
           if [[ "${{matrix.sanitize}}" == "yes" ]]; then
             echo "B2_ASAN=address-sanitizer=norecover" >> $GITHUB_ENV
-            echo "B2_UBSAN=undefined-sanitizer=norecover" >> $GITHUB_ENV
+            echo "B2_UBSAN=undefined-sanitizer=norecover cxxflags=-fsanitize-blacklist=libs/$LIBRARY/ubsan-blacklist" >> $GITHUB_ENV
           fi
           [[ "${{matrix.linkflags}}" == "" ]] || echo "B2_LINKFLAGS=linkflags=${{matrix.linkflags}}" >> $GITHUB_ENV
 

.github/workflows/update_standalone.yml

@@ -43,4 +43,3 @@ jobs:
           git commit -m "Include '${{github.event.head_commit.message}}'"
           remote_repo="https://${GITHUB_ACTOR}:${{secrets.GITHUB_TOKEN}}@github.com/${GITHUB_REPOSITORY}.git"
           git push "$remote_repo" HEAD:$STANDALONE_BRANCH_NAME
-      

CMakeLists.txt

@@ -54,10 +54,12 @@ option(Boost_NOWIDE_WERROR "Treat warnings as errors" "${def_WERROR}")
 
 file(READ ${CMAKE_CURRENT_SOURCE_DIR}/config/check_lfs_support.cpp lfsSource)
 check_cxx_source_compiles("${lfsSource}" BOOST_NOWIDE_HAS_LFS)
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/config/check_attribute_init_priority.cpp attributeInitPrioritySource)
+check_cxx_source_compiles("${attributeInitPrioritySource}" BOOST_NOWIDE_HAS_INIT_PRIORITY)
 
 # Using glob here is ok as it is only for headers
 file(GLOB_RECURSE headers include/*.hpp)
-add_library(boost_nowide src/cstdio.cpp src/cstdlib.cpp src/filebuf.cpp src/iostream.cpp src/stat.cpp ${headers})
+add_library(boost_nowide src/console_buffer.cpp src/cstdio.cpp src/cstdlib.cpp src/filebuf.cpp src/iostream.cpp src/stat.cpp ${headers})
 add_library(Boost::nowide ALIAS boost_nowide)
 set_target_properties(boost_nowide PROPERTIES
     CXX_VISIBILITY_PRESET hidden
@@ -71,6 +73,9 @@ endif()
 if(NOT BOOST_NOWIDE_HAS_LFS)
   target_compile_definitions(boost_nowide PRIVATE BOOST_NOWIDE_NO_LFS)
 endif()
+if(BOOST_NOWIDE_HAS_INIT_PRIORITY)
+  target_compile_definitions(boost_nowide PRIVATE BOOST_NOWIDE_HAS_INIT_PRIORITY)
+endif()
 target_compile_definitions(boost_nowide PUBLIC BOOST_NOWIDE_NO_LIB)
 target_include_directories(boost_nowide PUBLIC include)
 boost_add_warnings(boost_nowide pedantic ${Boost_NOWIDE_WERROR})

README.md

@@ -5,7 +5,9 @@ Branch      | Appveyor | Github | codecov.io | Documentation
 [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)   | [![Documentation](https://img.shields.io/badge/documentation-master-brightgreen.svg)](https://www.boost.org/doc/libs/master/libs/nowide/index.html)
 [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) | [![Documentation](https://img.shields.io/badge/documentation-develop-brightgreen.svg)](https://www.boost.org/doc/libs/develop/libs/nowide/index.html)
 
-Coverity Scan: [![Coverity Scan Build Status](https://scan.coverity.com/projects/20464/badge.svg)](https://scan.coverity.com/projects/boostorg-nowide)
+Quality checks:
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/20464/badge.svg)](https://scan.coverity.com/projects/boostorg-nowide)
+[![CodeFactor](https://www.codefactor.io/repository/github/boostorg/nowide/badge)](https://www.codefactor.io/repository/github/boostorg/nowide)
 
 Library for cross-platform, unicode aware programming.
 

build/Jamfile.v2

@@ -25,10 +25,11 @@ project boost/nowide
     ]
     [ check-target-builds ../config//cxx11_moveable_fstreams "std::fstream is moveable and swappable" : : <build>no ]
     [ check-target-builds ../config//lfs_support "Has Large File Support" : : <define>BOOST_NOWIDE_NO_LFS ]
+    [ check-target-builds ../config//attribute_init_priority "Has attribute init_priority" : <define>BOOST_NOWIDE_HAS_INIT_PRIORITY ]
   : usage-requirements $(requirements)
   ;
 
-local SOURCES = cstdio cstdlib filebuf iostream stat ;
+local SOURCES = console_buffer cstdio cstdlib filebuf iostream stat ;
 
 lib boost_nowide
   : $(SOURCES).cpp

cmake/BoostAddWarnings.cmake

@@ -14,7 +14,14 @@ function(boost_add_warnings target level)
   if(NOT level IN_LIST allowed_levels)
     message(FATAL_ERROR "${level} is not a valid warning level (${allowed_levels})")
   endif()
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  if(MSVC)
+    set(warn_off /W0)
+    set(warn_on /W3)
+    foreach(_lvl IN ITEMS all extra pedantic)
+      set(warn_${_lvl} /W4)
+    endforeach()
+    set(werror /WX)
+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(warn_off -w)
     set(warn_on  -Wall)
     set(warn_all -Wall)
@@ -27,13 +34,6 @@ function(boost_add_warnings target level)
       set(warn_${_lvl} -w1)
     endforeach()
     set(werror "")
-  elseif(MSVC)
-    set(warn_off /W0)
-    set(warn_on /W3)
-    foreach(_lvl IN ITEMS all extra pedantic)
-      set(warn_${_lvl} /W4)
-    endforeach()
-    set(werror /WX)
   endif()
   target_compile_options(${target} PRIVATE ${warn_${level}})
   if(warningsAsErrors)

config/Jamfile.v2

@@ -1,3 +1,6 @@
+obj attribute_init_priority : check_attribute_init_priority.cpp ;
+explicit attribute_init_priority ;
+
 obj cxx11_moveable_fstreams : check_movable_fstreams.cpp ;
 explicit cxx11_moveable_fstreams ;