Reimport boost/predef as a separate project

150 files changed, 20 insertions, 186 deletions

diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin.txt
index e9df897de3..dedbe66b5e 100644
--- a/CMakeLists.darwin.txt
+++ b/CMakeLists.darwin.txt
@@ -134,6 +134,7 @@ add_subdirectory(contrib/libs/re2)
 add_subdirectory(contrib/libs/utf8proc)
 add_subdirectory(contrib/restricted/boost)
 add_subdirectory(contrib/restricted/boost/config)
+add_subdirectory(contrib/restricted/boost/predef)
 add_subdirectory(contrib/restricted/boost/preprocessor)
 add_subdirectory(contrib/restricted/fast_float)
 add_subdirectory(contrib/restricted/thrift)
diff --git a/CMakeLists.linux.txt b/CMakeLists.linux.txt
index 872b06e43e..15e0e27948 100644
--- a/CMakeLists.linux.txt
+++ b/CMakeLists.linux.txt
@@ -212,6 +212,7 @@ add_subdirectory(contrib/libs/re2)
 add_subdirectory(contrib/libs/utf8proc)
 add_subdirectory(contrib/restricted/boost)
 add_subdirectory(contrib/restricted/boost/config)
+add_subdirectory(contrib/restricted/boost/predef)
 add_subdirectory(contrib/restricted/boost/preprocessor)
 add_subdirectory(contrib/restricted/fast_float)
 add_subdirectory(contrib/restricted/thrift)
diff --git a/contrib/restricted/boost/CMakeLists.txt b/contrib/restricted/boost/CMakeLists.txt
index 7d3d8ed05a..f37b79524b 100644
--- a/contrib/restricted/boost/CMakeLists.txt
+++ b/contrib/restricted/boost/CMakeLists.txt
@@ -14,5 +14,6 @@ target_include_directories(contrib-restricted-boost INTERFACE
 target_link_libraries(contrib-restricted-boost INTERFACE
   contrib-libs-cxxsupp
   restricted-boost-config
+  restricted-boost-predef
   restricted-boost-preprocessor
 )
diff --git a/contrib/restricted/boost/boost/predef/detail/test_def.h b/contrib/restricted/boost/boost/predef/detail/test_def.h
deleted file mode 100644
index c2f195bfd6..0000000000
--- a/contrib/restricted/boost/boost/predef/detail/test_def.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-Copyright Rene Rivera 2011-2015
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE_1_0.txt or copy at
-http://www.boost.org/LICENSE_1_0.txt)
-*/
-#include <boost/predef.h>
-
-#define BOOST_PREDEF_INTERNAL_GENERATE_TESTS
-
-void * add_predef_entry(const char * name, const char * description, unsigned value);
-#undef BOOST_PREDEF_DECLARE_TEST
-#define BOOST_PREDEF_DECLARE_TEST(x,s) void predef_entry_##x() { add_predef_entry(#x, s, x); }
-#include <boost/predef.h>
-
-#undef BOOST_PREDEF_DECLARE_TEST
-#define BOOST_PREDEF_DECLARE_TEST(x,s) predef_entry_##x();
-void create_predef_entries()
-{
-#include <boost/predef.h>
-}
-
-#ifdef __cplusplus
-#include <cstring>
-#include <cstdio>
-#include <cstdlib>
-using namespace std;
-#else
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#endif
-
-typedef struct predef_info
-{
-    const char * name;
-    const char * description;
-    unsigned value;
-} predef_info;
-
-#ifdef __cplusplus
-using namespace std;
-#endif
-
-unsigned generated_predef_info_count = 0;
-predef_info* generated_predef_info = 0;
-void * add_predef_entry(const char * name, const char * description, unsigned value)
-{
-    if (0 == generated_predef_info_count)
-    {
-        generated_predef_info_count = 1;
-        generated_predef_info = (predef_info*)malloc(sizeof(predef_info));
-    }
-    else
-    {
-        generated_predef_info_count += 1;
-        generated_predef_info = (predef_info*)realloc(generated_predef_info,
-            generated_predef_info_count*sizeof(predef_info));
-    }
-    generated_predef_info[generated_predef_info_count-1].name = name;
-    generated_predef_info[generated_predef_info_count-1].description = description;
-    generated_predef_info[generated_predef_info_count-1].value = value;
-    return 0;
-}
-
-int predef_info_compare(const void * a, const void * b)
-{
-    const predef_info * i = (const predef_info *)a;
-    const predef_info * j = (const predef_info *)b;
-    return strcmp(i->name,j->name);
-}
diff --git a/contrib/restricted/boost/boost/predef/other/workaround.h b/contrib/restricted/boost/boost/predef/other/workaround.h
deleted file mode 100644
index 7167a18ac6..0000000000
--- a/contrib/restricted/boost/boost/predef/other/workaround.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-Copyright Rene Rivera 2017
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE_1_0.txt or copy at
-http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-#ifndef BOOST_PREDEF_WORKAROUND_H
-#define BOOST_PREDEF_WORKAROUND_H
-
-/*`
-[heading `BOOST_PREDEF_WORKAROUND`]
-
-``
-BOOST_PREDEF_WORKAROUND(symbol,comp,major,minor,patch)
-``
-
-Usage:
-
-``
-#if BOOST_PREDEF_WORKAROUND(BOOST_COMP_CLANG,<,3,0,0)
-    // Workaround for old clang compilers..
-#endif
-``
-
-Defines a comparison against two version numbers that depends on the definion
-of `BOOST_STRICT_CONFIG`. When `BOOST_STRICT_CONFIG` is defined this will expand
-to a value convertible to `false`. Which has the effect of disabling all code
-conditionally guarded by `BOOST_PREDEF_WORKAROUND`. When `BOOST_STRICT_CONFIG`
-is undefine this expand to test the given `symbol` version value with the
-`comp` comparison against `BOOST_VERSION_NUMBER(major,minor,patch)`.
-*/
-#ifdef BOOST_STRICT_CONFIG
-#   define BOOST_PREDEF_WORKAROUND(symbol, comp, major, minor, patch) (0)
-#else
-#   include <boost/predef/version_number.h>
-#   define BOOST_PREDEF_WORKAROUND(symbol, comp, major, minor, patch) \
-        ( (symbol) != (0) ) && \
-        ( (symbol) comp (BOOST_VERSION_NUMBER( (major) , (minor) , (patch) )) )
-#endif
-
-/*`
-[heading `BOOST_PREDEF_TESTED_AT`]
-
-``
-BOOST_PREDEF_TESTED_AT(symbol,major,minor,patch)
-``
-
-Usage:
-
-``
-#if BOOST_PREDEF_TESTED_AT(BOOST_COMP_CLANG,3,5,0)
-    // Needed for clang, and last checked for 3.5.0.
-#endif
-``
-
-Defines a comparison against two version numbers that depends on the definion
-of `BOOST_STRICT_CONFIG` and `BOOST_DETECT_OUTDATED_WORKAROUNDS`.
-When `BOOST_STRICT_CONFIG` is defined this will expand to a value convertible
-to `false`. Which has the effect of disabling all code
-conditionally guarded by `BOOST_PREDEF_TESTED_AT`. When `BOOST_STRICT_CONFIG`
-is undefined this expand to either:
-
-* A value convertible to `true` when `BOOST_DETECT_OUTDATED_WORKAROUNDS` is not
-  defined.
-* A value convertible `true` when the expansion of
-  `BOOST_PREDEF_WORKAROUND(symbol, <=, major, minor, patch)` is `true` and
-  `BOOST_DETECT_OUTDATED_WORKAROUNDS` is defined.
-* A compile error when the expansion of
-  `BOOST_PREDEF_WORKAROUND(symbol, >, major, minor, patch)` is true and
-  `BOOST_DETECT_OUTDATED_WORKAROUNDS` is defined.
-*/
-#ifdef BOOST_STRICT_CONFIG
-#   define BOOST_PREDEF_TESTED_AT(symbol, major, minor, patch) (0)
-#else
-#   ifdef BOOST_DETECT_OUTDATED_WORKAROUNDS
-#       define BOOST_PREDEF_TESTED_AT(symbol, major, minor, patch) ( \
-            BOOST_PREDEF_WORKAROUND(symbol, <=, major, minor, patch) \
-            ? 1 \
-            : (1%0) )
-#   else
-#       define BOOST_PREDEF_TESTED_AT(symbol, major, minor, patch) \
-            ( (symbol) >= BOOST_VERSION_NUMBER_AVAILABLE )
-#   endif
-#endif
-
-#endif
diff --git a/contrib/restricted/boost/boost_common.inc b/contrib/restricted/boost/boost_common.inc
index 7c9054d7ca..1b2190866b 100644
--- a/contrib/restricted/boost/boost_common.inc
+++ b/contrib/restricted/boost/boost_common.inc
@@ -6,10 +6,6 @@ LICENSE(BSL-1.0)
 
 SET(BOOST_ROOT contrib/restricted/boost)
 
-ADDINCL(
-    ${BOOST_ROOT}/boost/predef
-)
-
 # XXX: fix selective checkout
 SRCDIR(${BOOST_ROOT}/boost)
 
diff --git a/contrib/restricted/boost/libs/chrono/CMakeLists.darwin.txt b/contrib/restricted/boost/libs/chrono/CMakeLists.darwin.txt
index 8a98462e9e..7f4d635bce 100644
--- a/contrib/restricted/boost/libs/chrono/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/libs/chrono/CMakeLists.darwin.txt
@@ -30,9 +30,6 @@ target_compile_options(boost-libs-chrono PRIVATE
   -D_DARWIN_C_SOURCE=1
   -Wno-everything
 )
-target_include_directories(boost-libs-chrono PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/boost/predef
-)
 target_link_libraries(boost-libs-chrono PUBLIC
   contrib-libs-cxxsupp
   contrib-restricted-boost
diff --git a/contrib/restricted/boost/libs/chrono/CMakeLists.linux.txt b/contrib/restricted/boost/libs/chrono/CMakeLists.linux.txt
index e119d864d2..0945206d10 100644
--- a/contrib/restricted/boost/libs/chrono/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/libs/chrono/CMakeLists.linux.txt
@@ -29,9 +29,6 @@ target_compile_options(boost-libs-chrono PRIVATE
   -DBOOST_THREAD_POSIX
   -Wno-everything
 )
-target_include_directories(boost-libs-chrono PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/boost/predef
-)
 target_link_libraries(boost-libs-chrono PUBLIC
   contrib-libs-cxxsupp
   contrib-restricted-boost
diff --git a/contrib/restricted/boost/libs/iostreams/CMakeLists.linux.txt b/contrib/restricted/boost/libs/iostreams/CMakeLists.linux.txt
index bf09e3c744..b954f4d6a0 100644
--- a/contrib/restricted/boost/libs/iostreams/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/libs/iostreams/CMakeLists.linux.txt
@@ -31,9 +31,6 @@ target_compile_options(boost-libs-iostreams PRIVATE
   -DBOOST_IOSTREAMS_USE_DEPRECATED
   -Wno-everything
 )
-target_include_directories(boost-libs-iostreams PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/boost/predef
-)
 target_link_libraries(boost-libs-iostreams PUBLIC
   contrib-libs-cxxsupp
   contrib-restricted-boost
diff --git a/contrib/restricted/boost/libs/program_options/CMakeLists.linux.txt b/contrib/restricted/boost/libs/program_options/CMakeLists.linux.txt
index 60d329b9ce..a1ea2f711d 100644
--- a/contrib/restricted/boost/libs/program_options/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/libs/program_options/CMakeLists.linux.txt
@@ -29,9 +29,6 @@ target_compile_options(boost-libs-program_options PRIVATE
   -DBOOST_THREAD_POSIX
   -Wno-everything
 )
-target_include_directories(boost-libs-program_options PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/boost/predef
-)
 target_link_libraries(boost-libs-program_options PUBLIC
   contrib-libs-cxxsupp
   contrib-restricted-boost
diff --git a/contrib/restricted/boost/libs/system/CMakeLists.darwin.txt b/contrib/restricted/boost/libs/system/CMakeLists.darwin.txt
index 5e1708aad0..9f2c479642 100644
--- a/contrib/restricted/boost/libs/system/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/libs/system/CMakeLists.darwin.txt
@@ -30,9 +30,6 @@ target_compile_options(boost-libs-system PRIVATE
   -D_DARWIN_C_SOURCE=1
   -Wno-everything
 )
-target_include_directories(boost-libs-system PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/boost/predef
-)
 target_link_libraries(boost-libs-system PUBLIC
   contrib-libs-cxxsupp
   contrib-restricted-boost
diff --git a/contrib/restricted/boost/libs/system/CMakeLists.linux.txt b/contrib/restricted/boost/libs/system/CMakeLists.linux.txt
index 86f627c67e..0782ed47f3 100644
--- a/contrib/restricted/boost/libs/system/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/libs/system/CMakeLists.linux.txt
@@ -29,9 +29,6 @@ target_compile_options(boost-libs-system PRIVATE
   -DBOOST_THREAD_POSIX
   -Wno-everything
 )
-target_include_directories(boost-libs-system PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/boost/predef
-)
 target_link_libraries(boost-libs-system PUBLIC
   contrib-libs-cxxsupp
   contrib-restricted-boost
diff --git a/contrib/restricted/boost/libs/thread/CMakeLists.darwin.txt b/contrib/restricted/boost/libs/thread/CMakeLists.darwin.txt
index 639961bdcb..cf9bd63bf4 100644
--- a/contrib/restricted/boost/libs/thread/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/libs/thread/CMakeLists.darwin.txt
@@ -30,9 +30,6 @@ target_compile_options(boost-libs-thread PRIVATE
   -D_DARWIN_C_SOURCE=1
   -Wno-everything
 )
-target_include_directories(boost-libs-thread PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/boost/predef
-)
 target_link_libraries(boost-libs-thread PUBLIC
   contrib-libs-cxxsupp
   contrib-restricted-boost
diff --git a/contrib/restricted/boost/libs/thread/CMakeLists.linux.txt b/contrib/restricted/boost/libs/thread/CMakeLists.linux.txt
index 255363a546..10de5114bd 100644
--- a/contrib/restricted/boost/libs/thread/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/libs/thread/CMakeLists.linux.txt
@@ -29,9 +29,6 @@ target_compile_options(boost-libs-thread PRIVATE
   -DBOOST_THREAD_POSIX
   -Wno-everything
 )
-target_include_directories(boost-libs-thread PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/boost/predef
-)
 target_link_libraries(boost-libs-thread PUBLIC
   contrib-libs-cxxsupp
   contrib-restricted-boost
diff --git a/contrib/restricted/boost/predef/CMakeLists.txt b/contrib/restricted/boost/predef/CMakeLists.txt
new file mode 100644
index 0000000000..13be637dd0
--- /dev/null
+++ b/contrib/restricted/boost/predef/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_library(restricted-boost-predef INTERFACE)
+target_include_directories(restricted-boost-predef INTERFACE
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/predef/include
+)
+target_link_libraries(restricted-boost-predef INTERFACE
+  contrib-libs-cxxsupp
+  yutil
+)
diff --git a/contrib/restricted/boost/boost/detail/endian.hpp b/contrib/restricted/boost/predef/include/boost/detail/endian.hpp
index f576c26b89..f576c26b89 100644
--- a/contrib/restricted/boost/boost/detail/endian.hpp
+++ b/contrib/restricted/boost/predef/include/boost/detail/endian.hpp
diff --git a/contrib/restricted/boost/boost/predef.h b/contrib/restricted/boost/predef/include/boost/predef.h
index 4965337875..4965337875 100644
--- a/contrib/restricted/boost/boost/predef.h
+++ b/contrib/restricted/boost/predef/include/boost/predef.h
diff --git a/contrib/restricted/boost/boost/predef/architecture.h b/contrib/restricted/boost/predef/include/boost/predef/architecture.h
index c433d437bd..c433d437bd 100644
--- a/contrib/restricted/boost/boost/predef/architecture.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/alpha.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/alpha.h
index 5bcade18b1..5bcade18b1 100644
--- a/contrib/restricted/boost/boost/predef/architecture/alpha.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/alpha.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/arm.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/arm.h
index 76f9f947bd..76f9f947bd 100644
--- a/contrib/restricted/boost/boost/predef/architecture/arm.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/arm.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/blackfin.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/blackfin.h
index 84c58a25e9..84c58a25e9 100644
--- a/contrib/restricted/boost/boost/predef/architecture/blackfin.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/blackfin.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/convex.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/convex.h
index ac783a9cc1..ac783a9cc1 100644
--- a/contrib/restricted/boost/boost/predef/architecture/convex.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/convex.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/ia64.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/ia64.h
index 9b1972bd39..9b1972bd39 100644
--- a/contrib/restricted/boost/boost/predef/architecture/ia64.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/ia64.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/m68k.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/m68k.h
index 63ed5f8479..63ed5f8479 100644
--- a/contrib/restricted/boost/boost/predef/architecture/m68k.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/m68k.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/mips.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/mips.h
index 0189d7dbd6..0189d7dbd6 100644
--- a/contrib/restricted/boost/boost/predef/architecture/mips.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/mips.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/parisc.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/parisc.h
index c75a1f3889..c75a1f3889 100644
--- a/contrib/restricted/boost/boost/predef/architecture/parisc.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/parisc.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/ppc.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/ppc.h
index e8c57c91f2..e8c57c91f2 100644
--- a/contrib/restricted/boost/boost/predef/architecture/ppc.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/ppc.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/pyramid.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/pyramid.h
index 4f13253807..4f13253807 100644
--- a/contrib/restricted/boost/boost/predef/architecture/pyramid.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/pyramid.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/rs6k.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/rs6k.h
index 8a6e9b6b53..8a6e9b6b53 100644
--- a/contrib/restricted/boost/boost/predef/architecture/rs6k.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/rs6k.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/sparc.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/sparc.h
index a89a5100b8..a89a5100b8 100644
--- a/contrib/restricted/boost/boost/predef/architecture/sparc.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/sparc.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/superh.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/superh.h
index da0529e5e0..da0529e5e0 100644
--- a/contrib/restricted/boost/boost/predef/architecture/superh.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/superh.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/sys370.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/sys370.h
index cfd85dc803..cfd85dc803 100644
--- a/contrib/restricted/boost/boost/predef/architecture/sys370.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/sys370.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/sys390.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/sys390.h
index 47aff6acd6..47aff6acd6 100644
--- a/contrib/restricted/boost/boost/predef/architecture/sys390.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/sys390.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/x86.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/x86.h
index 0ef3ef45ef..0ef3ef45ef 100644
--- a/contrib/restricted/boost/boost/predef/architecture/x86.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/x86.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/x86/32.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/x86/32.h
index 17fbff554a..17fbff554a 100644
--- a/contrib/restricted/boost/boost/predef/architecture/x86/32.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/x86/32.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/x86/64.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/x86/64.h
index f761c92596..f761c92596 100644
--- a/contrib/restricted/boost/boost/predef/architecture/x86/64.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/x86/64.h
diff --git a/contrib/restricted/boost/boost/predef/architecture/z.h b/contrib/restricted/boost/predef/include/boost/predef/architecture/z.h
index 3d218aa264..3d218aa264 100644
--- a/contrib/restricted/boost/boost/predef/architecture/z.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/architecture/z.h
diff --git a/contrib/restricted/boost/boost/predef/compiler.h b/contrib/restricted/boost/predef/include/boost/predef/compiler.h
index 61a4c527ab..61a4c527ab 100644
--- a/contrib/restricted/boost/boost/predef/compiler.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/borland.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/borland.h
index 3677cca7fd..3677cca7fd 100644
--- a/contrib/restricted/boost/boost/predef/compiler/borland.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/borland.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/clang.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/clang.h
index 56678fe6a5..56678fe6a5 100644
--- a/contrib/restricted/boost/boost/predef/compiler/clang.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/clang.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/comeau.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/comeau.h
index 15a4564896..15a4564896 100644
--- a/contrib/restricted/boost/boost/predef/compiler/comeau.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/comeau.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/compaq.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/compaq.h
index 96a79e6756..96a79e6756 100644
--- a/contrib/restricted/boost/boost/predef/compiler/compaq.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/compaq.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/diab.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/diab.h
index f5a37de7d3..f5a37de7d3 100644
--- a/contrib/restricted/boost/boost/predef/compiler/diab.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/diab.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/digitalmars.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/digitalmars.h
index 9bd58502e0..9bd58502e0 100644
--- a/contrib/restricted/boost/boost/predef/compiler/digitalmars.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/digitalmars.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/dignus.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/dignus.h
index c65d3dc764..c65d3dc764 100644
--- a/contrib/restricted/boost/boost/predef/compiler/dignus.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/dignus.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/edg.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/edg.h
index 2ffb9b0a6d..2ffb9b0a6d 100644
--- a/contrib/restricted/boost/boost/predef/compiler/edg.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/edg.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/ekopath.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/ekopath.h
index e5cde36752..e5cde36752 100644
--- a/contrib/restricted/boost/boost/predef/compiler/ekopath.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/ekopath.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/gcc.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/gcc.h
index c2d7fff178..c2d7fff178 100644
--- a/contrib/restricted/boost/boost/predef/compiler/gcc.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/gcc.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/gcc_xml.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/gcc_xml.h
index acae600c81..acae600c81 100644
--- a/contrib/restricted/boost/boost/predef/compiler/gcc_xml.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/gcc_xml.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/greenhills.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/greenhills.h
index 23b8f017d8..23b8f017d8 100644
--- a/contrib/restricted/boost/boost/predef/compiler/greenhills.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/greenhills.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/hp_acc.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/hp_acc.h
index 7b3ffe9068..7b3ffe9068 100644
--- a/contrib/restricted/boost/boost/predef/compiler/hp_acc.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/hp_acc.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/iar.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/iar.h
index 237f492e29..237f492e29 100644
--- a/contrib/restricted/boost/boost/predef/compiler/iar.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/iar.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/ibm.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/ibm.h
index 6931ebd884..6931ebd884 100644
--- a/contrib/restricted/boost/boost/predef/compiler/ibm.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/ibm.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/intel.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/intel.h
index f8a17ef437..f8a17ef437 100644
--- a/contrib/restricted/boost/boost/predef/compiler/intel.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/intel.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/kai.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/kai.h
index 68ce84e146..68ce84e146 100644
--- a/contrib/restricted/boost/boost/predef/compiler/kai.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/kai.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/llvm.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/llvm.h
index de654eb8ce..de654eb8ce 100644
--- a/contrib/restricted/boost/boost/predef/compiler/llvm.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/llvm.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/metaware.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/metaware.h
index 1a32039cef..1a32039cef 100644
--- a/contrib/restricted/boost/boost/predef/compiler/metaware.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/metaware.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/metrowerks.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/metrowerks.h
index f2d739b958..f2d739b958 100644
--- a/contrib/restricted/boost/boost/predef/compiler/metrowerks.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/metrowerks.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/microtec.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/microtec.h
index 066a6d2ad9..066a6d2ad9 100644
--- a/contrib/restricted/boost/boost/predef/compiler/microtec.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/microtec.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/mpw.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/mpw.h
index 118330646e..118330646e 100644
--- a/contrib/restricted/boost/boost/predef/compiler/mpw.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/mpw.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/palm.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/palm.h
index 707925a651..707925a651 100644
--- a/contrib/restricted/boost/boost/predef/compiler/palm.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/palm.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/pgi.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/pgi.h
index e016aeb080..e016aeb080 100644
--- a/contrib/restricted/boost/boost/predef/compiler/pgi.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/pgi.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/sgi_mipspro.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/sgi_mipspro.h
index 00739f0c3c..00739f0c3c 100644
--- a/contrib/restricted/boost/boost/predef/compiler/sgi_mipspro.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/sgi_mipspro.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/sunpro.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/sunpro.h
index 92c3926013..92c3926013 100644
--- a/contrib/restricted/boost/boost/predef/compiler/sunpro.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/sunpro.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/tendra.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/tendra.h
index c2bc5e4ef5..c2bc5e4ef5 100644
--- a/contrib/restricted/boost/boost/predef/compiler/tendra.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/tendra.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/visualc.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/visualc.h
index f81e61ed52..f81e61ed52 100644
--- a/contrib/restricted/boost/boost/predef/compiler/visualc.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/visualc.h
diff --git a/contrib/restricted/boost/boost/predef/compiler/watcom.h b/contrib/restricted/boost/predef/include/boost/predef/compiler/watcom.h
index b0e7776d06..b0e7776d06 100644
--- a/contrib/restricted/boost/boost/predef/compiler/watcom.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/compiler/watcom.h
diff --git a/contrib/restricted/boost/boost/predef/detail/_cassert.h b/contrib/restricted/boost/predef/include/boost/predef/detail/_cassert.h
index 940e944e2b..940e944e2b 100644
--- a/contrib/restricted/boost/boost/predef/detail/_cassert.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/detail/_cassert.h
diff --git a/contrib/restricted/boost/boost/predef/detail/_exception.h b/contrib/restricted/boost/predef/include/boost/predef/detail/_exception.h
index f5a6687a9f..f5a6687a9f 100644
--- a/contrib/restricted/boost/boost/predef/detail/_exception.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/detail/_exception.h
diff --git a/contrib/restricted/boost/boost/predef/detail/comp_detected.h b/contrib/restricted/boost/predef/include/boost/predef/detail/comp_detected.h
index fda1801b65..fda1801b65 100644
--- a/contrib/restricted/boost/boost/predef/detail/comp_detected.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/detail/comp_detected.h
diff --git a/contrib/restricted/boost/boost/predef/detail/endian_compat.h b/contrib/restricted/boost/predef/include/boost/predef/detail/endian_compat.h
index 7725e6823c..7725e6823c 100644
--- a/contrib/restricted/boost/boost/predef/detail/endian_compat.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/detail/endian_compat.h
diff --git a/contrib/restricted/boost/boost/predef/detail/os_detected.h b/contrib/restricted/boost/predef/include/boost/predef/detail/os_detected.h
index 08e10f993a..08e10f993a 100644
--- a/contrib/restricted/boost/boost/predef/detail/os_detected.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/detail/os_detected.h
diff --git a/contrib/restricted/boost/boost/predef/detail/platform_detected.h b/contrib/restricted/boost/predef/include/boost/predef/detail/platform_detected.h
index 4faf6938d8..4faf6938d8 100644
--- a/contrib/restricted/boost/boost/predef/detail/platform_detected.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/detail/platform_detected.h
diff --git a/contrib/restricted/boost/boost/predef/detail/test.h b/contrib/restricted/boost/predef/include/boost/predef/detail/test.h
index 546a9e407d..546a9e407d 100644
--- a/contrib/restricted/boost/boost/predef/detail/test.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/detail/test.h
diff --git a/contrib/restricted/boost/boost/predef/hardware.h b/contrib/restricted/boost/predef/include/boost/predef/hardware.h
index 972b73af68..972b73af68 100644
--- a/contrib/restricted/boost/boost/predef/hardware.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/hardware.h
diff --git a/contrib/restricted/boost/boost/predef/hardware/simd.h b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd.h
index ac5c9da2ca..ac5c9da2ca 100644
--- a/contrib/restricted/boost/boost/predef/hardware/simd.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd.h
diff --git a/contrib/restricted/boost/boost/predef/hardware/simd/arm.h b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/arm.h
index 3b3fc3fa36..3b3fc3fa36 100644
--- a/contrib/restricted/boost/boost/predef/hardware/simd/arm.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/arm.h
diff --git a/contrib/restricted/boost/boost/predef/hardware/simd/arm/versions.h b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/arm/versions.h
index 8425b31862..8425b31862 100644
--- a/contrib/restricted/boost/boost/predef/hardware/simd/arm/versions.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/arm/versions.h
diff --git a/contrib/restricted/boost/boost/predef/hardware/simd/ppc.h b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/ppc.h
index eef25c2d26..eef25c2d26 100644
--- a/contrib/restricted/boost/boost/predef/hardware/simd/ppc.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/ppc.h
diff --git a/contrib/restricted/boost/boost/predef/hardware/simd/ppc/versions.h b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/ppc/versions.h
index ffe3f0b1e5..ffe3f0b1e5 100644
--- a/contrib/restricted/boost/boost/predef/hardware/simd/ppc/versions.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/ppc/versions.h
diff --git a/contrib/restricted/boost/boost/predef/hardware/simd/x86.h b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/x86.h
index 88bd81e362..88bd81e362 100644
--- a/contrib/restricted/boost/boost/predef/hardware/simd/x86.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/x86.h
diff --git a/contrib/restricted/boost/boost/predef/hardware/simd/x86/versions.h b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/x86/versions.h
index 0c7a4d3813..0c7a4d3813 100644
--- a/contrib/restricted/boost/boost/predef/hardware/simd/x86/versions.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/x86/versions.h
diff --git a/contrib/restricted/boost/boost/predef/hardware/simd/x86_amd.h b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/x86_amd.h
index c80d1ce2b7..c80d1ce2b7 100644
--- a/contrib/restricted/boost/boost/predef/hardware/simd/x86_amd.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/x86_amd.h
diff --git a/contrib/restricted/boost/boost/predef/hardware/simd/x86_amd/versions.h b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/x86_amd/versions.h
index 1f9e96c500..1f9e96c500 100644
--- a/contrib/restricted/boost/boost/predef/hardware/simd/x86_amd/versions.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/hardware/simd/x86_amd/versions.h
diff --git a/contrib/restricted/boost/boost/predef/language.h b/contrib/restricted/boost/predef/include/boost/predef/language.h
index 0a317d5ece..0a317d5ece 100644
--- a/contrib/restricted/boost/boost/predef/language.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/language.h
diff --git a/contrib/restricted/boost/boost/predef/language/objc.h b/contrib/restricted/boost/predef/include/boost/predef/language/objc.h
index 24e3ad3c5c..24e3ad3c5c 100644
--- a/contrib/restricted/boost/boost/predef/language/objc.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/language/objc.h
diff --git a/contrib/restricted/boost/boost/predef/language/stdc.h b/contrib/restricted/boost/predef/include/boost/predef/language/stdc.h
index db25c12dc0..db25c12dc0 100644
--- a/contrib/restricted/boost/boost/predef/language/stdc.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/language/stdc.h
diff --git a/contrib/restricted/boost/boost/predef/language/stdcpp.h b/contrib/restricted/boost/predef/include/boost/predef/language/stdcpp.h
index 34dc8c7deb..34dc8c7deb 100644
--- a/contrib/restricted/boost/boost/predef/language/stdcpp.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/language/stdcpp.h
diff --git a/contrib/restricted/boost/boost/predef/library.h b/contrib/restricted/boost/predef/include/boost/predef/library.h
index 40518a90d8..40518a90d8 100644
--- a/contrib/restricted/boost/boost/predef/library.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library.h
diff --git a/contrib/restricted/boost/boost/predef/library/c.h b/contrib/restricted/boost/predef/include/boost/predef/library/c.h
index 7ca84cc079..7ca84cc079 100644
--- a/contrib/restricted/boost/boost/predef/library/c.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/c.h
diff --git a/contrib/restricted/boost/boost/predef/library/c/_prefix.h b/contrib/restricted/boost/predef/include/boost/predef/library/c/_prefix.h
index 12bcb0fb3f..12bcb0fb3f 100644
--- a/contrib/restricted/boost/boost/predef/library/c/_prefix.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/c/_prefix.h
diff --git a/contrib/restricted/boost/boost/predef/library/c/cloudabi.h b/contrib/restricted/boost/predef/include/boost/predef/library/c/cloudabi.h
index e6acaee65d..e6acaee65d 100644
--- a/contrib/restricted/boost/boost/predef/library/c/cloudabi.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/c/cloudabi.h
diff --git a/contrib/restricted/boost/boost/predef/library/c/gnu.h b/contrib/restricted/boost/predef/include/boost/predef/library/c/gnu.h
index 9e4ca89d64..9e4ca89d64 100644
--- a/contrib/restricted/boost/boost/predef/library/c/gnu.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/c/gnu.h
diff --git a/contrib/restricted/boost/boost/predef/library/c/uc.h b/contrib/restricted/boost/predef/include/boost/predef/library/c/uc.h
index 03081e94c6..03081e94c6 100644
--- a/contrib/restricted/boost/boost/predef/library/c/uc.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/c/uc.h
diff --git a/contrib/restricted/boost/boost/predef/library/c/vms.h b/contrib/restricted/boost/predef/include/boost/predef/library/c/vms.h
index 685f1a77d6..685f1a77d6 100644
--- a/contrib/restricted/boost/boost/predef/library/c/vms.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/c/vms.h
diff --git a/contrib/restricted/boost/boost/predef/library/c/zos.h b/contrib/restricted/boost/predef/include/boost/predef/library/c/zos.h
index 222d35539f..222d35539f 100644
--- a/contrib/restricted/boost/boost/predef/library/c/zos.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/c/zos.h
diff --git a/contrib/restricted/boost/boost/predef/library/std.h b/contrib/restricted/boost/predef/include/boost/predef/library/std.h
index 403b6ff37a..403b6ff37a 100644
--- a/contrib/restricted/boost/boost/predef/library/std.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/std.h
diff --git a/contrib/restricted/boost/boost/predef/library/std/_prefix.h b/contrib/restricted/boost/predef/include/boost/predef/library/std/_prefix.h
index 932b8557b1..932b8557b1 100644
--- a/contrib/restricted/boost/boost/predef/library/std/_prefix.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/std/_prefix.h
diff --git a/contrib/restricted/boost/boost/predef/library/std/cxx.h b/contrib/restricted/boost/predef/include/boost/predef/library/std/cxx.h
index 07b52cd6af..07b52cd6af 100644
--- a/contrib/restricted/boost/boost/predef/library/std/cxx.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/std/cxx.h
diff --git a/contrib/restricted/boost/boost/predef/library/std/dinkumware.h b/contrib/restricted/boost/predef/include/boost/predef/library/std/dinkumware.h
index 0fc077605d..0fc077605d 100644
--- a/contrib/restricted/boost/boost/predef/library/std/dinkumware.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/std/dinkumware.h
diff --git a/contrib/restricted/boost/boost/predef/library/std/libcomo.h b/contrib/restricted/boost/predef/include/boost/predef/library/std/libcomo.h
index 97d4a53d6f..97d4a53d6f 100644
--- a/contrib/restricted/boost/boost/predef/library/std/libcomo.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/std/libcomo.h
diff --git a/contrib/restricted/boost/boost/predef/library/std/modena.h b/contrib/restricted/boost/predef/include/boost/predef/library/std/modena.h
index b67ac62f17..b67ac62f17 100644
--- a/contrib/restricted/boost/boost/predef/library/std/modena.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/std/modena.h
diff --git a/contrib/restricted/boost/boost/predef/library/std/msl.h b/contrib/restricted/boost/predef/include/boost/predef/library/std/msl.h
index d73c74c6d8..d73c74c6d8 100644
--- a/contrib/restricted/boost/boost/predef/library/std/msl.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/std/msl.h
diff --git a/contrib/restricted/boost/boost/predef/library/std/roguewave.h b/contrib/restricted/boost/predef/include/boost/predef/library/std/roguewave.h
index 9c3f288b6f..9c3f288b6f 100644
--- a/contrib/restricted/boost/boost/predef/library/std/roguewave.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/std/roguewave.h
diff --git a/contrib/restricted/boost/boost/predef/library/std/sgi.h b/contrib/restricted/boost/predef/include/boost/predef/library/std/sgi.h
index 5d19bbac4d..5d19bbac4d 100644
--- a/contrib/restricted/boost/boost/predef/library/std/sgi.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/std/sgi.h
diff --git a/contrib/restricted/boost/boost/predef/library/std/stdcpp3.h b/contrib/restricted/boost/predef/include/boost/predef/library/std/stdcpp3.h
index c9802924a7..c9802924a7 100644
--- a/contrib/restricted/boost/boost/predef/library/std/stdcpp3.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/std/stdcpp3.h
diff --git a/contrib/restricted/boost/boost/predef/library/std/stlport.h b/contrib/restricted/boost/predef/include/boost/predef/library/std/stlport.h
index c09483bd9f..c09483bd9f 100644
--- a/contrib/restricted/boost/boost/predef/library/std/stlport.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/std/stlport.h
diff --git a/contrib/restricted/boost/boost/predef/library/std/vacpp.h b/contrib/restricted/boost/predef/include/boost/predef/library/std/vacpp.h
index 632f846c20..632f846c20 100644
--- a/contrib/restricted/boost/boost/predef/library/std/vacpp.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/library/std/vacpp.h
diff --git a/contrib/restricted/boost/boost/predef/make.h b/contrib/restricted/boost/predef/include/boost/predef/make.h
index 36b891aa33..36b891aa33 100644
--- a/contrib/restricted/boost/boost/predef/make.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/make.h
diff --git a/contrib/restricted/boost/boost/predef/os.h b/contrib/restricted/boost/predef/include/boost/predef/os.h
index bedf99ec54..bedf99ec54 100644
--- a/contrib/restricted/boost/boost/predef/os.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os.h
diff --git a/contrib/restricted/boost/boost/predef/os/aix.h b/contrib/restricted/boost/predef/include/boost/predef/os/aix.h
index 3e5a953f1b..3e5a953f1b 100644
--- a/contrib/restricted/boost/boost/predef/os/aix.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/aix.h
diff --git a/contrib/restricted/boost/boost/predef/os/amigaos.h b/contrib/restricted/boost/predef/include/boost/predef/os/amigaos.h
index 7b32ddf59c..7b32ddf59c 100644
--- a/contrib/restricted/boost/boost/predef/os/amigaos.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/amigaos.h
diff --git a/contrib/restricted/boost/boost/predef/os/android.h b/contrib/restricted/boost/predef/include/boost/predef/os/android.h
index 125dbded9e..125dbded9e 100644
--- a/contrib/restricted/boost/boost/predef/os/android.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/android.h
diff --git a/contrib/restricted/boost/boost/predef/os/beos.h b/contrib/restricted/boost/predef/include/boost/predef/os/beos.h
index 19f4cb71e3..19f4cb71e3 100644
--- a/contrib/restricted/boost/boost/predef/os/beos.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/beos.h
diff --git a/contrib/restricted/boost/boost/predef/os/bsd.h b/contrib/restricted/boost/predef/include/boost/predef/os/bsd.h
index fad9aed787..fad9aed787 100644
--- a/contrib/restricted/boost/boost/predef/os/bsd.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/bsd.h
diff --git a/contrib/restricted/boost/boost/predef/os/bsd/bsdi.h b/contrib/restricted/boost/predef/include/boost/predef/os/bsd/bsdi.h
index afdcd3eb7c..afdcd3eb7c 100644
--- a/contrib/restricted/boost/boost/predef/os/bsd/bsdi.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/bsd/bsdi.h
diff --git a/contrib/restricted/boost/boost/predef/os/bsd/dragonfly.h b/contrib/restricted/boost/predef/include/boost/predef/os/bsd/dragonfly.h
index 1d075798a1..1d075798a1 100644
--- a/contrib/restricted/boost/boost/predef/os/bsd/dragonfly.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/bsd/dragonfly.h
diff --git a/contrib/restricted/boost/boost/predef/os/bsd/free.h b/contrib/restricted/boost/predef/include/boost/predef/os/bsd/free.h
index 81c002109d..81c002109d 100644
--- a/contrib/restricted/boost/boost/predef/os/bsd/free.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/bsd/free.h
diff --git a/contrib/restricted/boost/boost/predef/os/bsd/net.h b/contrib/restricted/boost/predef/include/boost/predef/os/bsd/net.h
index 387cbde54f..387cbde54f 100644
--- a/contrib/restricted/boost/boost/predef/os/bsd/net.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/bsd/net.h
diff --git a/contrib/restricted/boost/boost/predef/os/bsd/open.h b/contrib/restricted/boost/predef/include/boost/predef/os/bsd/open.h
index f6ccd24a9b..f6ccd24a9b 100644
--- a/contrib/restricted/boost/boost/predef/os/bsd/open.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/bsd/open.h
diff --git a/contrib/restricted/boost/boost/predef/os/cygwin.h b/contrib/restricted/boost/predef/include/boost/predef/os/cygwin.h
index 9d36f0f317..9d36f0f317 100644
--- a/contrib/restricted/boost/boost/predef/os/cygwin.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/cygwin.h
diff --git a/contrib/restricted/boost/boost/predef/os/haiku.h b/contrib/restricted/boost/predef/include/boost/predef/os/haiku.h
index d79dbeac88..d79dbeac88 100644
--- a/contrib/restricted/boost/boost/predef/os/haiku.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/haiku.h
diff --git a/contrib/restricted/boost/boost/predef/os/hpux.h b/contrib/restricted/boost/predef/include/boost/predef/os/hpux.h
index 29243f4879..29243f4879 100644
--- a/contrib/restricted/boost/boost/predef/os/hpux.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/hpux.h
diff --git a/contrib/restricted/boost/boost/predef/os/ios.h b/contrib/restricted/boost/predef/include/boost/predef/os/ios.h
index f853815a6d..f853815a6d 100644
--- a/contrib/restricted/boost/boost/predef/os/ios.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/ios.h
diff --git a/contrib/restricted/boost/boost/predef/os/irix.h b/contrib/restricted/boost/predef/include/boost/predef/os/irix.h
index fa6ac41dcd..fa6ac41dcd 100644
--- a/contrib/restricted/boost/boost/predef/os/irix.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/irix.h
diff --git a/contrib/restricted/boost/boost/predef/os/linux.h b/contrib/restricted/boost/predef/include/boost/predef/os/linux.h
index a297d08954..a297d08954 100644
--- a/contrib/restricted/boost/boost/predef/os/linux.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/linux.h
diff --git a/contrib/restricted/boost/boost/predef/os/macos.h b/contrib/restricted/boost/predef/include/boost/predef/os/macos.h
index 4afb30d087..4afb30d087 100644
--- a/contrib/restricted/boost/boost/predef/os/macos.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/macos.h
diff --git a/contrib/restricted/boost/boost/predef/os/os400.h b/contrib/restricted/boost/predef/include/boost/predef/os/os400.h
index b3446c26c9..b3446c26c9 100644
--- a/contrib/restricted/boost/boost/predef/os/os400.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/os400.h
diff --git a/contrib/restricted/boost/boost/predef/os/qnxnto.h b/contrib/restricted/boost/predef/include/boost/predef/os/qnxnto.h
index e76fbf2781..e76fbf2781 100644
--- a/contrib/restricted/boost/boost/predef/os/qnxnto.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/qnxnto.h
diff --git a/contrib/restricted/boost/boost/predef/os/solaris.h b/contrib/restricted/boost/predef/include/boost/predef/os/solaris.h
index 75ddc91dae..75ddc91dae 100644
--- a/contrib/restricted/boost/boost/predef/os/solaris.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/solaris.h
diff --git a/contrib/restricted/boost/boost/predef/os/unix.h b/contrib/restricted/boost/predef/include/boost/predef/os/unix.h
index a60710427a..a60710427a 100644
--- a/contrib/restricted/boost/boost/predef/os/unix.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/unix.h
diff --git a/contrib/restricted/boost/boost/predef/os/vms.h b/contrib/restricted/boost/predef/include/boost/predef/os/vms.h
index 2f8f786d4e..2f8f786d4e 100644
--- a/contrib/restricted/boost/boost/predef/os/vms.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/vms.h
diff --git a/contrib/restricted/boost/boost/predef/os/windows.h b/contrib/restricted/boost/predef/include/boost/predef/os/windows.h
index 9db4390950..9db4390950 100644
--- a/contrib/restricted/boost/boost/predef/os/windows.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/os/windows.h
diff --git a/contrib/restricted/boost/boost/predef/other.h b/contrib/restricted/boost/predef/include/boost/predef/other.h
index c09ad4945f..c09ad4945f 100644
--- a/contrib/restricted/boost/boost/predef/other.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/other.h
diff --git a/contrib/restricted/boost/boost/predef/other/endian.h b/contrib/restricted/boost/predef/include/boost/predef/other/endian.h
index 6d1f43ff4d..6d1f43ff4d 100644
--- a/contrib/restricted/boost/boost/predef/other/endian.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/other/endian.h
diff --git a/contrib/restricted/boost/boost/predef/platform.h b/contrib/restricted/boost/predef/include/boost/predef/platform.h
index 6c366d595c..6c366d595c 100644
--- a/contrib/restricted/boost/boost/predef/platform.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/platform.h
diff --git a/contrib/restricted/boost/boost/predef/platform/cloudabi.h b/contrib/restricted/boost/predef/include/boost/predef/platform/cloudabi.h
index c44f689454..c44f689454 100644
--- a/contrib/restricted/boost/boost/predef/platform/cloudabi.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/platform/cloudabi.h
diff --git a/contrib/restricted/boost/boost/predef/platform/ios.h b/contrib/restricted/boost/predef/include/boost/predef/platform/ios.h
index af1c364cf0..af1c364cf0 100644
--- a/contrib/restricted/boost/boost/predef/platform/ios.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/platform/ios.h
diff --git a/contrib/restricted/boost/boost/predef/platform/mingw.h b/contrib/restricted/boost/predef/include/boost/predef/platform/mingw.h
index c52827d7d8..c52827d7d8 100644
--- a/contrib/restricted/boost/boost/predef/platform/mingw.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/platform/mingw.h
diff --git a/contrib/restricted/boost/boost/predef/platform/mingw32.h b/contrib/restricted/boost/predef/include/boost/predef/platform/mingw32.h
index ff90038b4c..ff90038b4c 100644
--- a/contrib/restricted/boost/boost/predef/platform/mingw32.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/platform/mingw32.h
diff --git a/contrib/restricted/boost/boost/predef/platform/mingw64.h b/contrib/restricted/boost/predef/include/boost/predef/platform/mingw64.h
index a35dd3e016..a35dd3e016 100644
--- a/contrib/restricted/boost/boost/predef/platform/mingw64.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/platform/mingw64.h
diff --git a/contrib/restricted/boost/boost/predef/platform/windows_desktop.h b/contrib/restricted/boost/predef/include/boost/predef/platform/windows_desktop.h
index afb39079a6..afb39079a6 100644
--- a/contrib/restricted/boost/boost/predef/platform/windows_desktop.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/platform/windows_desktop.h
diff --git a/contrib/restricted/boost/boost/predef/platform/windows_phone.h b/contrib/restricted/boost/predef/include/boost/predef/platform/windows_phone.h
index 0ebc76d276..0ebc76d276 100644
--- a/contrib/restricted/boost/boost/predef/platform/windows_phone.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/platform/windows_phone.h
diff --git a/contrib/restricted/boost/boost/predef/platform/windows_runtime.h b/contrib/restricted/boost/predef/include/boost/predef/platform/windows_runtime.h
index e7978d7525..e7978d7525 100644
--- a/contrib/restricted/boost/boost/predef/platform/windows_runtime.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/platform/windows_runtime.h
diff --git a/contrib/restricted/boost/boost/predef/platform/windows_server.h b/contrib/restricted/boost/predef/include/boost/predef/platform/windows_server.h
index 7bd629da34..7bd629da34 100644
--- a/contrib/restricted/boost/boost/predef/platform/windows_server.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/platform/windows_server.h
diff --git a/contrib/restricted/boost/boost/predef/platform/windows_store.h b/contrib/restricted/boost/predef/include/boost/predef/platform/windows_store.h
index 3a3fd8e982..3a3fd8e982 100644
--- a/contrib/restricted/boost/boost/predef/platform/windows_store.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/platform/windows_store.h
diff --git a/contrib/restricted/boost/boost/predef/platform/windows_system.h b/contrib/restricted/boost/predef/include/boost/predef/platform/windows_system.h
index 92f424fe7f..92f424fe7f 100644
--- a/contrib/restricted/boost/boost/predef/platform/windows_system.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/platform/windows_system.h
diff --git a/contrib/restricted/boost/boost/predef/platform/windows_uwp.h b/contrib/restricted/boost/predef/include/boost/predef/platform/windows_uwp.h
index e4c6647f41..e4c6647f41 100644
--- a/contrib/restricted/boost/boost/predef/platform/windows_uwp.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/platform/windows_uwp.h
diff --git a/contrib/restricted/boost/boost/predef/version.h b/contrib/restricted/boost/predef/include/boost/predef/version.h
index bcf97adfc2..bcf97adfc2 100644
--- a/contrib/restricted/boost/boost/predef/version.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/version.h
diff --git a/contrib/restricted/boost/boost/predef/version_number.h b/contrib/restricted/boost/predef/include/boost/predef/version_number.h
index 44942709c7..44942709c7 100644
--- a/contrib/restricted/boost/boost/predef/version_number.h
+++ b/contrib/restricted/boost/predef/include/boost/predef/version_number.h