aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslesarev <slesarev@yandex-team.ru>2022-02-10 16:46:58 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:46:58 +0300
commit5598c5e7bc7619bd51d87fea7b880b7788ad0b47 (patch)
treeb83306b6e37edeea782e9eed673d89286c4fef35
parent7aa53a76943e449d3889a4e711338deb819fcd1f (diff)
downloadydb-5598c5e7bc7619bd51d87fea7b880b7788ad0b47.tar.gz
Restoring authorship annotation for <slesarev@yandex-team.ru>. Commit 2 of 2.
-rwxr-xr-xbuild/ymake_conf.py2
-rw-r--r--contrib/libs/ya.make18
-rw-r--r--util/generic/algorithm.h16
-rw-r--r--util/system/filemap.cpp8
4 files changed, 22 insertions, 22 deletions
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index 7c8f2aa63b..30219eb85e 100755
--- a/build/ymake_conf.py
+++ b/build/ymake_conf.py
@@ -561,7 +561,7 @@ class Build(object):
@property
def is_valgrind(self):
return self.build_type == 'valgrind' or self.build_type == 'valgrind-release'
-
+
@property
def is_ide(self):
return self.is_ide_build_type(self.build_type)
diff --git a/contrib/libs/ya.make b/contrib/libs/ya.make
index 558363b25d..9c4640fdcf 100644
--- a/contrib/libs/ya.make
+++ b/contrib/libs/ya.make
@@ -57,7 +57,7 @@ RECURSE(
eccodes
eccodes/python
eccodes/tools
- eigen
+ eigen
expat
falconn
farmhash
@@ -78,7 +78,7 @@ RECURSE(
fontconfig
fp16
freetype
- fuse
+ fuse
fxdiv
gamma_function_apache_math_port
gdal
@@ -218,7 +218,7 @@ RECURSE(
lz4
lz4/generated
lzmasdk
- lzo2
+ lzo2
matrixssl
mecab
metrohash
@@ -263,7 +263,7 @@ RECURSE(
osrm
pam
pango
- pcre
+ pcre
pcre2
pdqsort
pffft
@@ -377,7 +377,7 @@ IF (OS_FREEBSD OR OS_LINUX)
mod_perl2
libeatmydata
)
-ENDIF()
+ENDIF()
IF (OS_DARWIN)
RECURSE(
@@ -407,7 +407,7 @@ IF (OS_LINUX)
uuid
virtiofsd
)
-ENDIF()
+ENDIF()
IF (OS_WINDOWS)
RECURSE(
@@ -415,18 +415,18 @@ IF (OS_WINDOWS)
dokany/dokan
dokany/dokan_fuse
)
-ELSE()
+ELSE()
RECURSE(
lftp
unixodbc
)
-ENDIF()
+ENDIF()
IF (OS_LINUX OR OS_WINDOWS)
RECURSE(
lockless
)
-ENDIF()
+ENDIF()
IF (OS_ANDROID)
RECURSE(
diff --git a/util/generic/algorithm.h b/util/generic/algorithm.h
index ee2c40d605..badfb88993 100644
--- a/util/generic/algorithm.h
+++ b/util/generic/algorithm.h
@@ -258,16 +258,16 @@ static inline void MakeHeap(I f, I l, C c) {
std::make_heap(f, l, c);
}
-template <class I>
-static inline void SortHeap(I f, I l) {
+template <class I>
+static inline void SortHeap(I f, I l) {
std::sort_heap(f, l);
-}
-
-template <class I, class C>
-static inline void SortHeap(I f, I l, C c) {
+}
+
+template <class I, class C>
+static inline void SortHeap(I f, I l, C c) {
std::sort_heap(f, l, c);
-}
-
+}
+
template <class I, class T>
static inline I LowerBound(I f, I l, const T& v) {
return std::lower_bound(f, l, v);
diff --git a/util/system/filemap.cpp b/util/system/filemap.cpp
index 7184f36ab0..7454a4cb94 100644
--- a/util/system/filemap.cpp
+++ b/util/system/filemap.cpp
@@ -139,7 +139,7 @@ public:
} else {
Mapping_ = MAP_FAILED;
}
-#elif defined(_unix_)
+#elif defined(_unix_)
if (!(Mode_ & oNotGreedy)) {
PtrStart_ = mmap((caddr_t) nullptr, Length_, ModeToMmapProt(Mode_), ModeToMmapFlags(Mode_), File_.GetHandle(), 0);
@@ -300,7 +300,7 @@ public:
void Evict() {
#if defined(_unix_)
-// Evict(PtrStart_, Length_);
+// Evict(PtrStart_, Length_);
#endif
}
@@ -310,7 +310,7 @@ public:
::CloseHandle(Mapping_); // != FALSE
Mapping_ = nullptr;
}
-#elif defined(_unix_)
+#elif defined(_unix_)
if (PtrStart_) {
munmap((caddr_t)PtrStart_, Length_);
}
@@ -341,7 +341,7 @@ private:
#if defined(_win_)
void* Mapping_;
-#elif defined(_unix_)
+#elif defined(_unix_)
void* PtrStart_;
#endif
};