intermediate changes

ref:94d2b0447400b3d6d5501eb9a4c05c0a3f225c61

26 files changed, 60 insertions, 6 deletions

diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index 87d789664e..f8c5ef4655 100755
--- a/build/ymake_conf.py
+++ b/build/ymake_conf.py
@@ -2458,7 +2458,6 @@ class MSVCCompiler(MSVC, Compiler):
                 '-Wno-bitwise-op-parentheses',
                 '-Wno-extern-initializer',
                 '-Wno-format',
-                '-Wno-inconsistent-dllimport',
                 '-Wno-logical-op-parentheses',
                 '-Wno-macro-redefined',
                 '-Wno-parentheses',
diff --git a/contrib/restricted/boost/boost_common.inc b/contrib/restricted/boost/boost_common.inc
index ac87e45c40..7c9054d7ca 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)
 
-PEERDIR(
-    ${BOOST_ROOT}
-)
-
 ADDINCL(
     ${BOOST_ROOT}/boost/predef
 )
diff --git a/contrib/restricted/boost/libs/asio/ya.make b/contrib/restricted/boost/libs/asio/ya.make
index 127ba91c55..f6ddb32521 100644
--- a/contrib/restricted/boost/libs/asio/ya.make
+++ b/contrib/restricted/boost/libs/asio/ya.make
@@ -15,6 +15,7 @@ OWNER(
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
 
 PEERDIR(
+    ${BOOST_ROOT}
     ${BOOST_ROOT}/libs/date_time
     ${BOOST_ROOT}/libs/system
     contrib/libs/openssl
diff --git a/contrib/restricted/boost/libs/atomic/ya.make b/contrib/restricted/boost/libs/atomic/ya.make
index 7bbe714418..9a80fb9bf2 100644
--- a/contrib/restricted/boost/libs/atomic/ya.make
+++ b/contrib/restricted/boost/libs/atomic/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 SRCS(
     src/lockpool.cpp
diff --git a/contrib/restricted/boost/libs/chrono/ya.make b/contrib/restricted/boost/libs/chrono/ya.make
index e9f2172645..e21a093b13 100644
--- a/contrib/restricted/boost/libs/chrono/ya.make
+++ b/contrib/restricted/boost/libs/chrono/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 SRCS(
     src/chrono.cpp
diff --git a/contrib/restricted/boost/libs/container/ya.make b/contrib/restricted/boost/libs/container/ya.make
index bc9a2cd150..30a3be4096 100644
--- a/contrib/restricted/boost/libs/container/ya.make
+++ b/contrib/restricted/boost/libs/container/ya.make
@@ -14,6 +14,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 SRCS(
     src/alloc_lib.c
diff --git a/contrib/restricted/boost/libs/context/ya.make b/contrib/restricted/boost/libs/context/ya.make
index 0ed9d696fe..14357eb440 100644
--- a/contrib/restricted/boost/libs/context/ya.make
+++ b/contrib/restricted/boost/libs/context/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 CFLAGS(
     -DBOOST_CONTEXT_SOURCE
diff --git a/contrib/restricted/boost/libs/coroutine/ya.make b/contrib/restricted/boost/libs/coroutine/ya.make
index b0093b9475..a069e74161 100644
--- a/contrib/restricted/boost/libs/coroutine/ya.make
+++ b/contrib/restricted/boost/libs/coroutine/ya.make
@@ -13,6 +13,7 @@ OWNER(
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
 
 PEERDIR(
+    ${BOOST_ROOT}
     ${BOOST_ROOT}/libs/context
 )
 
diff --git a/contrib/restricted/boost/libs/date_time/ya.make b/contrib/restricted/boost/libs/date_time/ya.make
index 21ad128e07..d0ae000924 100644
--- a/contrib/restricted/boost/libs/date_time/ya.make
+++ b/contrib/restricted/boost/libs/date_time/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 SRCS(
     src/gregorian/date_generators.cpp
diff --git a/contrib/restricted/boost/libs/exception/ya.make b/contrib/restricted/boost/libs/exception/ya.make
index bef34a6144..58040456cf 100644
--- a/contrib/restricted/boost/libs/exception/ya.make
+++ b/contrib/restricted/boost/libs/exception/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 SRCS(
     src/clone_current_exception_non_intrusive.cpp
diff --git a/contrib/restricted/boost/libs/filesystem/ya.make b/contrib/restricted/boost/libs/filesystem/ya.make
index bfad363675..b6ce67f074 100644
--- a/contrib/restricted/boost/libs/filesystem/ya.make
+++ b/contrib/restricted/boost/libs/filesystem/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 IF (DYNAMIC_BOOST)
     CFLAGS(
diff --git a/contrib/restricted/boost/libs/iostreams/ya.make b/contrib/restricted/boost/libs/iostreams/ya.make
index a2a0614496..e895a2a01e 100644
--- a/contrib/restricted/boost/libs/iostreams/ya.make
+++ b/contrib/restricted/boost/libs/iostreams/ya.make
@@ -13,6 +13,7 @@ OWNER(
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
 
 PEERDIR(
+    ${BOOST_ROOT}
     contrib/libs/zlib
     contrib/libs/libbz2
 )
diff --git a/contrib/restricted/boost/libs/locale/ya.make b/contrib/restricted/boost/libs/locale/ya.make
index c214b86dbc..2481027bf3 100644
--- a/contrib/restricted/boost/libs/locale/ya.make
+++ b/contrib/restricted/boost/libs/locale/ya.make
@@ -13,6 +13,7 @@ OWNER(
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
 
 PEERDIR(
+    ${BOOST_ROOT}
     contrib/libs/icu
 )
 
diff --git a/contrib/restricted/boost/libs/log/ya.make b/contrib/restricted/boost/libs/log/ya.make
index 09429ee0cd..dfc4857f20 100644
--- a/contrib/restricted/boost/libs/log/ya.make
+++ b/contrib/restricted/boost/libs/log/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 ADDINCL(
     ${BOOST_ROOT}/libs/log/src
diff --git a/contrib/restricted/boost/libs/program_options/ya.make b/contrib/restricted/boost/libs/program_options/ya.make
index bc228af72f..7eab6a2fe3 100644
--- a/contrib/restricted/boost/libs/program_options/ya.make
+++ b/contrib/restricted/boost/libs/program_options/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 SRCS(
     src/cmdline.cpp
diff --git a/contrib/restricted/boost/libs/python/ya.make b/contrib/restricted/boost/libs/python/ya.make
index 8a9607986f..0b6ba48c10 100644
--- a/contrib/restricted/boost/libs/python/ya.make
+++ b/contrib/restricted/boost/libs/python/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 CFLAGS(
     GLOBAL -DBOOST_PYTHON_STATIC_LIB
diff --git a/contrib/restricted/boost/libs/random/ya.make b/contrib/restricted/boost/libs/random/ya.make
index 5d319bcb88..97d37aea16 100644
--- a/contrib/restricted/boost/libs/random/ya.make
+++ b/contrib/restricted/boost/libs/random/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 SRCS(
     src/random_device.cpp
diff --git a/contrib/restricted/boost/libs/regex/ya.make b/contrib/restricted/boost/libs/regex/ya.make
index 379c0831ae..dd36cfa1f6 100644
--- a/contrib/restricted/boost/libs/regex/ya.make
+++ b/contrib/restricted/boost/libs/regex/ya.make
@@ -13,6 +13,7 @@ OWNER(
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
 
 PEERDIR(
+    ${BOOST_ROOT}
     contrib/libs/icu
 )
 
diff --git a/contrib/restricted/boost/libs/serialization/ya.make b/contrib/restricted/boost/libs/serialization/ya.make
index 5576e6a7ed..1f3250ed5b 100644
--- a/contrib/restricted/boost/libs/serialization/ya.make
+++ b/contrib/restricted/boost/libs/serialization/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 SRCS(
     src/archive_exception.cpp
diff --git a/contrib/restricted/boost/libs/system/ya.make b/contrib/restricted/boost/libs/system/ya.make
index 4571531ed1..4a0180be25 100644
--- a/contrib/restricted/boost/libs/system/ya.make
+++ b/contrib/restricted/boost/libs/system/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 SRCS(
     src/error_code.cpp
diff --git a/contrib/restricted/boost/libs/test/targets/lib/ya.make b/contrib/restricted/boost/libs/test/targets/lib/ya.make
index 4058af6c64..1f4f5f4907 100644
--- a/contrib/restricted/boost/libs/test/targets/lib/ya.make
+++ b/contrib/restricted/boost/libs/test/targets/lib/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 SRCDIR(${BOOST_ROOT}/libs/test/src)
 
diff --git a/contrib/restricted/boost/libs/test/targets/prog/ya.make b/contrib/restricted/boost/libs/test/targets/prog/ya.make
index 0111d202fb..c37d25f187 100644
--- a/contrib/restricted/boost/libs/test/targets/prog/ya.make
+++ b/contrib/restricted/boost/libs/test/targets/prog/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 SRCDIR(${BOOST_ROOT}/libs/test/src)
 
diff --git a/contrib/restricted/boost/libs/test/targets/test/ya.make b/contrib/restricted/boost/libs/test/targets/test/ya.make
index 34111fc0a8..8579de0681 100644
--- a/contrib/restricted/boost/libs/test/targets/test/ya.make
+++ b/contrib/restricted/boost/libs/test/targets/test/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 SRCDIR(${BOOST_ROOT}/libs/test/src)
 
diff --git a/contrib/restricted/boost/libs/thread/ya.make b/contrib/restricted/boost/libs/thread/ya.make
index 880df0ebc6..8d9431a462 100644
--- a/contrib/restricted/boost/libs/thread/ya.make
+++ b/contrib/restricted/boost/libs/thread/ya.make
@@ -13,6 +13,7 @@ OWNER(
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
 
 PEERDIR(
+    ${BOOST_ROOT}
     ${BOOST_ROOT}/libs/chrono
     ${BOOST_ROOT}/libs/system
 )
diff --git a/contrib/restricted/boost/libs/timer/ya.make b/contrib/restricted/boost/libs/timer/ya.make
index 897693bdf7..aadb12815f 100644
--- a/contrib/restricted/boost/libs/timer/ya.make
+++ b/contrib/restricted/boost/libs/timer/ya.make
@@ -11,6 +11,9 @@ OWNER(
 )
 
 INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+PEERDIR(
+    ${BOOST_ROOT}
+)
 
 SRCS(
     src/auto_timers_construction.cpp
diff --git a/contrib/restricted/boost/ya.make b/contrib/restricted/boost/ya.make
index 77e2dc66c0..365c90d184 100644
--- a/contrib/restricted/boost/ya.make
+++ b/contrib/restricted/boost/ya.make
@@ -20,10 +20,12 @@ OWNER(
     g:cpp-contrib
 )
 
+INCLUDE(${ARCADIA_ROOT}/contrib/restricted/boost/boost_common.inc)
+
 NO_UTIL()
 
 # This is the header-only version of boost
-# To use a boost library with separate compilation units, 
+# To use a boost library with separate compilation units,
 # one should use `contrib/restricted/boost/libs/$lib`
 
 ADDINCL(