Restoring authorship annotation for <anna-velichko@yandex-team.ru>. Commit 2 of 2.

13 files changed, 96 insertions, 96 deletions

diff --git a/build/external_resources/codenavigation/ya.make b/build/external_resources/codenavigation/ya.make
index 4629109cf3..8cfdf0d3d5 100644
--- a/build/external_resources/codenavigation/ya.make
+++ b/build/external_resources/codenavigation/ya.make
@@ -2,7 +2,7 @@ OWNER(g:yatool)
 
 RESOURCES_LIBRARY()
 
-NO_CODENAVIGATION() 
+NO_CODENAVIGATION()
 NO_RUNTIME()
 
 IF (OS_LINUX)
diff --git a/build/scripts/python_yndexer.py b/build/scripts/python_yndexer.py
index 583d1f7f9b..3180665387 100644
--- a/build/scripts/python_yndexer.py
+++ b/build/scripts/python_yndexer.py
@@ -42,10 +42,10 @@ if __name__ == '__main__':
     timeout = int(sys.argv[2])
     output_file = sys.argv[3]
     input_file = sys.argv[4]
-    partition_count = sys.argv[5] 
-    partition_index = sys.argv[6] 
+    partition_count = sys.argv[5]
+    partition_index = sys.argv[6]
 
-    process = Process([yndexer, '-f', input_file, '-y', output_file, '-c', partition_count, '-i', partition_index]) 
+    process = Process([yndexer, '-f', input_file, '-y', output_file, '-c', partition_count, '-i', partition_index])
     result = process.wait(timeout=timeout)
 
     if result != 0:
diff --git a/build/ya.conf.json b/build/ya.conf.json
index 4db87ecbf1..5f7cc875d6 100644
--- a/build/ya.conf.json
+++ b/build/ya.conf.json
@@ -6556,7 +6556,7 @@
         },
         "ymakeyndexer": {
             "formula": {
-                "sandbox_id": 239256113, 
+                "sandbox_id": 239256113,
                 "match": "YMAKEYNDEXER"
             },
             "executable": {
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 793d74775f..081833998b 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -24,7 +24,7 @@ INCLUDE_EXTS=.h .hh .hpp .rli .cuh .inc .i
 CPP_EXT=.cpp
 OBJ_SUF=
 CFLAGS=
-EXTRA_C_FLAGS= 
+EXTRA_C_FLAGS=
 SFLAGS=
 
 AUTOCHECK_BALANCING_OPTIONS=
@@ -117,7 +117,7 @@ when ($CODENAVIGATION && $NOCODENAVIGATION != "yes") {
     YNDEXER_OUTPUT=${output;noauto;suf=${OBJ_CROSS_SUF}.ydx.pb2:SRC}
 }
 otherwise {
-    PY_PROGRAM_LINK_EXE=$LINK_EXE 
+    PY_PROGRAM_LINK_EXE=$LINK_EXE
     YNDEXER_ARGS=
     YNDEXER_OUTPUT=
 }
@@ -2550,7 +2550,7 @@ module FAT_OBJECT: LIBRARY {
     .ALLOWED=PACK_GLOBALS_IN_LIBRARY
     .CMD=LINK_FAT_OBJECT_CMD
     .PEERDIR_POLICY=as_build_from
- 
+
     when ($MSVC == "yes" || $CYGWIN == "yes") {
         MODULE_SUFFIX=.global.lib
     }
@@ -2797,7 +2797,7 @@ macro DYNAMIC_LIBRARY_FROM(Path...) {
 ###
 ### Dynamic library module defintion.
 ### 1. major_ver and minor_ver must be integers.
-### 2. EXPORTS allows you to explicitly specify the list of exported functions. This accepts 2 kind of files: .exports with <lang symbol> pairs and JSON-line .symlist files 
+### 2. EXPORTS allows you to explicitly specify the list of exported functions. This accepts 2 kind of files: .exports with <lang symbol> pairs and JSON-line .symlist files
 ### 3. PREFIX allows you to change the prefix of the output file (default DLL has the prefix "lib").
 ###
 ### DLL cannot participate in linking to programs but can be used from Java or as final artifact (packaged and deployed).
@@ -2823,25 +2823,25 @@ module DLL_TOOL: DLL {
     .NODE_TYPE=Program
 }
 
-### @usage: SO_PROGRAM(name major_ver [minor_ver] [EXPORTS symlist_file] [PREFIX prefix]) 
-### 
-### Executable dynamic library module defintion. 
-### 1. major_ver and minor_ver must be integers. 
-### 2. EXPORTS allows you to explicitly specify the list of exported functions. This accepts 2 kind of files: .exports with <lang symbol> pairs and JSON-line .symlist files 
-### 3. PREFIX allows you to change the prefix of the output file. 
-module SO_PROGRAM: DLL { 
-    .CMD=LINK_EXEC_DYN_LIB 
+### @usage: SO_PROGRAM(name major_ver [minor_ver] [EXPORTS symlist_file] [PREFIX prefix])
+###
+### Executable dynamic library module defintion.
+### 1. major_ver and minor_ver must be integers.
+### 2. EXPORTS allows you to explicitly specify the list of exported functions. This accepts 2 kind of files: .exports with <lang symbol> pairs and JSON-line .symlist files
+### 3. PREFIX allows you to change the prefix of the output file.
+module SO_PROGRAM: DLL {
+    .CMD=LINK_EXEC_DYN_LIB
     SET(MODULE_TYPE PROGRAM)
 
-    MODULE_PREFIX= 
-    when ($MSVC == "yes" || $CYGWIN == "yes") { 
-        MODULE_SUFFIX=.exe 
-    } 
-    otherwise { 
-        MODULE_SUFFIX= 
-    } 
-} 
- 
+    MODULE_PREFIX=
+    when ($MSVC == "yes" || $CYGWIN == "yes") {
+        MODULE_SUFFIX=.exe
+    }
+    otherwise {
+        MODULE_SUFFIX=
+    }
+}
+
 DLL_PROXY_CMD_MF=$GENERATE_MF && $COPY_CMD $AUTO_INPUT $TARGET
 
 # tag:internal
@@ -4603,7 +4603,7 @@ UBERJAR_SERVICES_RESOURCE_TRANSFORMER_FLAG=
 ###
 ### Add ServicesResourceTransformer for UBERJAR() java programs
 ###
-### @see: [UBERJAR](#macro_UBERJAR) 
+### @see: [UBERJAR](#macro_UBERJAR)
 macro UBERJAR_SERVICES_RESOURCE_TRANSFORMER() {
     SET(UBERJAR_SERVICES_RESOURCE_TRANSFORMER_VALUE yes)
     SET(UBERJAR_SERVICES_RESOURCE_TRANSFORMER_FLAG --service-transformer)
@@ -4764,7 +4764,7 @@ DEPENDENCY_MANAGEMENT_VALUE=
 ###      with the default from contrib/java/junit/junit/ya.make.
 ###      These defaults are always there and are supported by maven-import, which puts
 ###      there the maximum version available in contrib/java.
-### 
+###
 ### The property is transitive. That is, if module A PEERDIRs module B, and B has PEERDIR(contrib/java/junit/junit), and this junit was replaced by junit-4.12, then junit-4.12 will come to A through B.
 ###
 ### If some module has both DEPENDENCY_MANAGEMENT(contrib/java/junit/junit/4.12) and PERDIR(contrib/java/junit/junit/4.11), the PEERDIR wins.
@@ -4856,7 +4856,7 @@ macro JAVA_EXTERNAL_DEPENDENCIES(Args...) {
 
 # tag:java-specific
 ### @usage _JAVA_PLACEHOLDER #internal
-### The base module for all Java modules. Defines common properties and dependencies. 
+### The base module for all Java modules. Defines common properties and dependencies.
 module _JAVA_PLACEHOLDER: _BASE_UNIT  {
     .CMD=TOUCH_JAVA_UNIT
     .FINAL_TARGET=yes
@@ -5622,16 +5622,16 @@ SSE4_CFLAGS=
 
 # tag:cpu
 when (($ARCH_X86_64 || $ARCH_I386) && $DISABLE_INSTRUCTION_SETS != "yes") {
-    when ($CLANG || $CLANG_CL || $GCC) { 
+    when ($CLANG || $CLANG_CL || $GCC) {
         PIC_CFLAGS=-fPIC
-        SSE2_CFLAGS=-msse2 
-        SSE3_CFLAGS=-msse3 
-        SSSE3_CFLAGS=-mssse3 
-        SSE41_CFLAGS=-msse4.1 
+        SSE2_CFLAGS=-msse2
+        SSE3_CFLAGS=-msse3
+        SSSE3_CFLAGS=-mssse3
+        SSE41_CFLAGS=-msse4.1
         SSE42_CFLAGS=-msse4.2
         POPCNT_CFLAGS=-mpopcnt
         PCLMUL_CFLAGS=-mpclmul
-        AVX_CFLAGS=-mavx 
+        AVX_CFLAGS=-mavx
 
         # On Intel FMA3 instruction set comes together with AVX-2 extension starting with Broadwell / Haswell.
         # See:
@@ -5652,8 +5652,8 @@ when (($ARCH_X86_64 || $ARCH_I386) && $DISABLE_INSTRUCTION_SETS != "yes") {
         }
         SSE_DEFINES=-DSSE_ENABLED=1 -DSSE3_ENABLED=1 -DSSSE3_ENABLED=1
         SSE4_DEFINES=-DSSE41_ENABLED=1 -DSSE42_ENABLED=1 -DPOPCNT_ENABLED=1 -DCX16_ENABLED=1
-    } 
-    elsewhen ($MSVC) { 
+    }
+    elsewhen ($MSVC) {
         SSE2_CFLAGS=/D__SSE2__=1
         SSE3_CFLAGS=/D__SSE3__=1
         SSSE3_CFLAGS=/D__SSSE3__=1
@@ -6152,7 +6152,7 @@ macro SRC(FILE, FLAGS...) {
 ### The scope of the GLOBAL keyword is the following file (that is, in the case of SRCS(GLOBAL foo.cpp bar.cpp) global will be only foo.cpp)
 ###
 ### @example:
-### 
+###
 ###     LIBRARY(test_global)
 ###         SRCS(GLOBAL foo.cpp)
 ###     END()
@@ -6418,7 +6418,7 @@ macro PIRE_INLINE(FILES...) {
 
 ### @usage: ARCHIVE(archive_name [DONT_COMPRESS] files...)
 ###
-### Add arbitrary data to a modules. Unlike RESOURCE macro the result should be futher processed by othet macros in the module. 
+### Add arbitrary data to a modules. Unlike RESOURCE macro the result should be futher processed by othet macros in the module.
 ###
 ### Example: https://wiki.yandex-team.ru/yatool/howtowriteyamakefiles/#a1ispolzujjtekomanduarchive
 macro ARCHIVE(NAME="", DONTCOMPRESS?"-p":"", REQUIREMENTS[], Files...) {
@@ -6428,7 +6428,7 @@ macro ARCHIVE(NAME="", DONTCOMPRESS?"-p":"", REQUIREMENTS[], Files...) {
 ### @usage: ARCHIVE_BY_KEYS(archive_name key [DONT_COMPRESS] files...)
 ###
 ### Add arbitrary data to a module be accessible by specified key.
-### Unlike RESOURCE macro the result should be futher processed by othet macros in the module. 
+### Unlike RESOURCE macro the result should be futher processed by othet macros in the module.
 ###
 ### Example: https://wiki.yandex-team.ru/yatool/howtowriteyamakefiles/#a1ispolzujjtekomanduarchive
 macro ARCHIVE_BY_KEYS(NAME="", KEYS="", DONTCOMPRESS?"-p":"", REQUIREMENTS[], Files...) {
@@ -7107,12 +7107,12 @@ macro FROM_ARCHIVE(Src, OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[],
     .CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/fetch_from_archive.py"} "--archive" ${input:Src} "--file-name" ${suf=-:Src} "--untar-to" $PREFIX ${pre=--rename :RENAME} $EXECUTABLE -- $OUT $OUT_NOAUTO ${input;hide:"build/scripts/fetch_from.py"} ${output_include;hide:OUTPUT_INCLUDES} ${output;hide:OUT} ${output;noauto;hide:OUT_NOAUTO} ${kv;hide:"p FA"} ${kv;hide:"pc yellow"} ${kv;hide:"show_out"}
 }
 
-when ($MSVC == "yes") { 
+when ($MSVC == "yes") {
     C_AS_CXX_FLAGS=/TP /std:c++17
-} 
-otherwise { 
-    C_AS_CXX_FLAGS=-x c++ -std=c++17 
-} 
+}
+otherwise {
+    C_AS_CXX_FLAGS=-x c++ -std=c++17
+}
 
 # tag:cpp-specific
 ### @usage: COMPILE_C_AS_CXX()
@@ -8715,7 +8715,7 @@ macro JAVA_IGNORE_CLASSPATH_CLASH_FOR(Args...) {
 ###
 ### Build specified Python sources according to Arcadia binary Python build. Basically creates precompiled and source resources keyed with module paths.
 ### The resources eventually are linked into final program and can be accessed as regular Python modules.
-### This custom loader linked into the program will add them to sys.meta_path. 
+### This custom loader linked into the program will add them to sys.meta_path.
 ###
 ### PY_SRCS also support .proto, .ev, .pyx and .swg files. The .proto and .ev are compiled to .py-code by protoc and than handled as usual .py files.
 ### .pyx and .swg lead to C/C++ Python extensions generation, that are automatically registered in Python as built-in modules.
@@ -8731,7 +8731,7 @@ macro JAVA_IGNORE_CLASSPATH_CLASH_FOR(Args...) {
 ###     END()
 ###
 ### PY_SRCS honors Python2 and Python3 differences and adjusts itself to Python version of a current module.
-### PY_SRCS can be used in any Arcadia Python build modules like PY*_LIBRARY, PY*_PROGRAM, PY*TEST. 
+### PY_SRCS can be used in any Arcadia Python build modules like PY*_LIBRARY, PY*_PROGRAM, PY*TEST.
 ### PY_SRCS in LIBRARY or PROGRAM effectively converts these into PY2_LIBRARY and PY2_PROGRAM respectively.
 ### It is strongly advised to make this conversion explicit. Never use PY_SRCS in a LIBRARY if you plan to use it from external Python extension module.
 ###
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index 1082a56f62..30219eb85e 100755
--- a/build/ymake_conf.py
+++ b/build/ymake_conf.py
@@ -1638,9 +1638,9 @@ class GnuCompiler(Compiler):
             append('CFLAGS', '-march=pentiumpro')
             append('CFLAGS', '-mtune=pentiumpro')
 
-        append('BC_CFLAGS', '$CFLAGS') 
-        append('BC_CXXFLAGS', '$CXXFLAGS') 
- 
+        append('BC_CFLAGS', '$CFLAGS')
+        append('BC_CXXFLAGS', '$CXXFLAGS')
+
         append('C_DEFINES', '-D__LONG_LONG_SUPPORTED')
 
         emit('OBJ_CROSS_SUF', '$OBJ_SUF%s' % self.cross_suffix)
@@ -2043,7 +2043,7 @@ class LD(Linker):
 
         arch_flag = '--arch={arch}'.format(arch=self.target.os_compat)
         soname_flag = '-Wl,{option},${{_SONAME}}'.format(option=self.soname_option)
-        shared_flag = '-shared' 
+        shared_flag = '-shared'
         exec_shared_flag = '-pie -fPIE -Wl,--unresolved-symbols=ignore-all -rdynamic' if self.target.is_linux else ''
         if self.whole_archive:
             srcs_globals = self.whole_archive + ' ${rootrel;ext=.a:SRCS_GLOBAL} ' + self.no_whole_archive \
@@ -2089,8 +2089,8 @@ class LD(Linker):
                  )
             emit('REAL_LINK_EXE', '$REAL_LINK_EXE_IMPL($_WHOLE_ARCHIVE_PEERS_VALUE)')
 
-        # Executable Shared Library 
- 
+        # Executable Shared Library
+
         emit('REAL_LINK_EXEC_DYN_LIB_CMDLINE',
              '$YMAKE_PYTHON ${input:"build/scripts/link_dyn_lib.py"}',
              '--target $TARGET',
@@ -2108,7 +2108,7 @@ class LD(Linker):
              ld_env_style,
              )
         emit('REAL_LINK_EXEC_DYN_LIB', '$REAL_LINK_EXEC_DYN_LIB_IMPL($_WHOLE_ARCHIVE_PEERS_VALUE)')
- 
+
         # Shared Library
 
         emit('LINK_DYN_LIB_FLAGS')
@@ -2436,7 +2436,7 @@ class MSVCCompiler(MSVC, Compiler):
             "/Zc:__cplusplus"
         ]
 
-        if self.tc.use_clang: 
+        if self.tc.use_clang:
             flags += [
                 # Allow <windows.h> to be included via <Windows.h> in case-sensitive file-systems.
                 '-fcase-insensitive-paths',
@@ -2477,10 +2477,10 @@ class MSVCCompiler(MSVC, Compiler):
 
             cxx_warnings += [
                 '-Woverloaded-virtual',
-                '-Wno-register',  # IGNIETFERRO-722 needed for contrib 
-                '-Wimport-preprocessor-directive-pedantic', 
-                '-Wno-undefined-var-template', 
-            ] 
+                '-Wno-register',  # IGNIETFERRO-722 needed for contrib
+                '-Wimport-preprocessor-directive-pedantic',
+                '-Wno-undefined-var-template',
+            ]
             if self.tc.version_at_least(2019):
                 cxx_warnings += [
                     '-Wno-deprecated-volatile',
@@ -2502,11 +2502,11 @@ class MSVCCompiler(MSVC, Compiler):
                 if self.tc.version_exactly(2019):
                     flags.append('-fms-compatibility-version=19.21')
 
-            if self.tc.ide_msvs: 
+            if self.tc.ide_msvs:
                 cxx_warnings += [
-                    '-Wno-unused-command-line-argument', 
-                ] 
- 
+                    '-Wno-unused-command-line-argument',
+                ]
+
         if target.is_armv7:
             masm_io = '-o ${output;suf=${OBJECT_SUF}:SRC} ${input;msvs_source:SRC}'
         else:
@@ -2540,22 +2540,22 @@ class MSVCCompiler(MSVC, Compiler):
                 flags.append(include_flag(os.path.join(self.tc.kit_includes, name)))
             flags.append(include_flag(vc_include))
 
-        flags_msvs_only = [] 
- 
+        flags_msvs_only = []
+
         if self.tc.ide_msvs:
-            if not self.tc.use_clang: 
-                flags_msvs_only += ['/FD', '/MP'] 
+            if not self.tc.use_clang:
+                flags_msvs_only += ['/FD', '/MP']
             debug_info_flags = '/Zi /FS'
         else:
             debug_info_flags = '/Z7'
 
-        if self.tc.use_clang: 
-            emit('CLANG_CL', 'yes') 
-        if self.tc.ide_msvs: 
-            emit('IDE_MSVS', 'yes') 
-        if self.tc.use_arcadia_toolchain: 
-            emit('USE_ARCADIA_TOOLCHAIN', 'yes') 
- 
+        if self.tc.use_clang:
+            emit('CLANG_CL', 'yes')
+        if self.tc.ide_msvs:
+            emit('IDE_MSVS', 'yes')
+        if self.tc.use_arcadia_toolchain:
+            emit('USE_ARCADIA_TOOLCHAIN', 'yes')
+
         emit('CXX_COMPILER', self.tc.cxx_compiler)
         emit('C_COMPILER', self.tc.c_compiler)
         emit('MASM_COMPILER', self.tc.masm_compiler)
@@ -2580,7 +2580,7 @@ class MSVCCompiler(MSVC, Compiler):
 
         append('BC_CFLAGS', '$CFLAGS')
         append('BC_CXXFLAGS', '$BC_CFLAGS', '$CXXFLAGS')
- 
+
         ucrt_include = os.path.join(self.tc.kit_includes, 'ucrt') if not self.tc.ide_msvs else "$(UniversalCRT_IncludePath.Split(';')[0].Replace('\\','/'))"
 
         # clang-cl has '#include_next', and MSVC hasn't. It needs separately specified CRT and VC include directories for libc++ to include second in order standard C and C++ headers.
@@ -2813,7 +2813,7 @@ class MSVCLinker(MSVC, Linker):
         emit('LINK_PEERS_FAT_OBJECT', '${TOOLCHAIN_ENV} ${cwd:ARCADIA_BUILD_ROOT} ${LIB_WRAPPER} ${LINK_LIB_CMD} /OUT:${qe;rootrel;output:REALPRJNAME.lib} \
             --ya-start-command-file ${qe;rootrel:PEERS} $LINK_LIB_FLAGS --ya-end-command-file')
         emit('LINK_FAT_OBJECT', '${GENERATE_MF} && $GENERATE_VCS_C_INFO_NODEP && $LINK_GLOBAL_FAT_OBJECT && $LINK_PEERS_FAT_OBJECT ${kv;hide:"p LD"} ${requirements;hide:LD_REQUIREMENTS} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"}')  # noqa E501
- 
+
 
 # TODO(somov): Rename!
 Compilers = {
diff --git a/contrib/libs/base64/avx2/ya.make b/contrib/libs/base64/avx2/ya.make
index fb848a5100..b0dc5ce772 100644
--- a/contrib/libs/base64/avx2/ya.make
+++ b/contrib/libs/base64/avx2/ya.make
@@ -21,7 +21,7 @@ SRCS(
 )
 
 IF (ARCH_X86_64 OR ARCH_I386)
-    IF (MSVC AND NOT CLANG_CL) 
+    IF (MSVC AND NOT CLANG_CL)
         CONLYFLAGS(/D__AVX2__=1)
     ELSEIF (CLANG_CL)
         CONLYFLAGS(-mavx2)
diff --git a/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_msvc.ipp b/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_msvc.ipp
index 063367da81..4eb1803f0b 100644
--- a/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_msvc.ipp
+++ b/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_msvc.ipp
@@ -14,9 +14,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <__config> 
- 
-#ifdef _LIBCPP_COMPILER_MSVC 
+#include <__config>
+
+#ifdef _LIBCPP_COMPILER_MSVC
 // We don't want to depend on MSVC headers but
 // we have conflicting definitions otherwise due to
 // some other dependency on eh.h.
diff --git a/contrib/libs/farmhash/arch/sse41/ya.make b/contrib/libs/farmhash/arch/sse41/ya.make
index 0a490f871d..b3b2964c99 100644
--- a/contrib/libs/farmhash/arch/sse41/ya.make
+++ b/contrib/libs/farmhash/arch/sse41/ya.make
@@ -8,7 +8,7 @@ OWNER(somov)
 
 NO_COMPILER_WARNINGS()
 
-IF (NOT MSVC OR CLANG_CL) 
+IF (NOT MSVC OR CLANG_CL)
     CFLAGS(-msse4.1)
 ENDIF()
 
diff --git a/contrib/libs/farmhash/arch/sse42/ya.make b/contrib/libs/farmhash/arch/sse42/ya.make
index 552896969e..6df471feb7 100644
--- a/contrib/libs/farmhash/arch/sse42/ya.make
+++ b/contrib/libs/farmhash/arch/sse42/ya.make
@@ -8,7 +8,7 @@ OWNER(somov)
 
 NO_COMPILER_WARNINGS()
 
-IF (NOT MSVC OR CLANG_CL) 
+IF (NOT MSVC OR CLANG_CL)
     CFLAGS(-msse4.2)
 ENDIF()
 
diff --git a/contrib/libs/farmhash/arch/sse42_aesni/ya.make b/contrib/libs/farmhash/arch/sse42_aesni/ya.make
index cae8d3d3f1..4d558bc2a2 100644
--- a/contrib/libs/farmhash/arch/sse42_aesni/ya.make
+++ b/contrib/libs/farmhash/arch/sse42_aesni/ya.make
@@ -8,7 +8,7 @@ OWNER(somov)
 
 NO_COMPILER_WARNINGS()
 
-IF (NOT MSVC OR CLANG_CL) 
+IF (NOT MSVC OR CLANG_CL)
     CFLAGS(
         -msse4.2
         -maes
diff --git a/contrib/restricted/boost/boost/iostreams/detail/config/fpos.hpp b/contrib/restricted/boost/boost/iostreams/detail/config/fpos.hpp
index 8a614f45c3..76db861fc1 100644
--- a/contrib/restricted/boost/boost/iostreams/detail/config/fpos.hpp
+++ b/contrib/restricted/boost/boost/iostreams/detail/config/fpos.hpp
@@ -40,7 +40,7 @@
 
 # endif
 
-#if defined(_LIBCPP_COMPILER_MSVC) || defined(_LIBCPP_COMPILER_CLANG) 
+#if defined(_LIBCPP_COMPILER_MSVC) || defined(_LIBCPP_COMPILER_CLANG)
 #undef BOOST_IOSTREAMS_HAS_DINKUMWARE_FPOS
 #endif
 
diff --git a/contrib/tools/bison/gnulib/platform/win64/stdint.h.disabled b/contrib/tools/bison/gnulib/platform/win64/stdint.h.disabled
index be7f5cbbe5..35ff0479f4 100644
--- a/contrib/tools/bison/gnulib/platform/win64/stdint.h.disabled
+++ b/contrib/tools/bison/gnulib/platform/win64/stdint.h.disabled
@@ -38,11 +38,11 @@
 #ifndef _MSC_STDINT_H_
 
 #if _MSC_VER >= 1600
-#  ifndef __clang__ 
-#     include <../include/stdint.h> 
-#  else 
-#     include_next <stdint.h> 
-#  endif 
+#  ifndef __clang__
+#     include <../include/stdint.h>
+#  else
+#     include_next <stdint.h>
+#  endif
 #endif
 
 #ifndef _MSC_STDINT_H_
diff --git a/contrib/tools/python/src/Include/pyconfig.win32.h b/contrib/tools/python/src/Include/pyconfig.win32.h
index 09f61e2a65..3640ccd81a 100644
--- a/contrib/tools/python/src/Include/pyconfig.win32.h
+++ b/contrib/tools/python/src/Include/pyconfig.win32.h
@@ -114,8 +114,8 @@ WIN32 is still required for the locale module.
  */
 #define _Py_PASTE_VERSION(SUFFIX) \
 	("[MSC v." _Py_STRINGIZE(_MSC_VER) " " SUFFIX "]")
- 
-#ifndef __clang__ 
+
+#ifndef __clang__
 /* e.g., this produces, after compile-time string catenation,
  * 	("[MSC v.1200 32 bit (Intel)]")
  *
@@ -130,11 +130,11 @@ WIN32 is still required for the locale module.
 #define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X
 #define _Py_STRINGIZE2(X) #X
 
-#else 
-#define _Py_STRINGIZE(X) _Py_STRINGIZE1(X) 
-#define _Py_STRINGIZE1(X) #X 
-#endif 
- 
+#else
+#define _Py_STRINGIZE(X) _Py_STRINGIZE1(X)
+#define _Py_STRINGIZE1(X) #X
+#endif
+
 /* MSVC defines _WINxx to differentiate the windows platform types
 
    Note that for compatibility reasons _WIN32 is defined on Win32