Get rid of unnecessary patches over contrib/libs/apache/orc

737e3d4a5a1b19a4141e01f50630ac62288573fc

3 files changed, 227 insertions, 208 deletions

diff --git a/contrib/libs/apache/orc/c++/src/Adaptor-linux.hh b/contrib/libs/apache/orc/c++/src/Adaptor-linux.hh
new file mode 100644
index 0000000000..625c1befb2
--- /dev/null
+++ b/contrib/libs/apache/orc/c++/src/Adaptor-linux.hh
@@ -0,0 +1,215 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ADAPTER_HH
+#define ADAPTER_HH
+
+/* #undef INT64_IS_LL */
+#define HAS_CONSTEXPR
+#define HAS_PREAD
+#define HAS_STRPTIME
+#define HAS_STOLL
+#define HAS_DIAGNOSTIC_PUSH
+#define HAS_DOUBLE_TO_STRING
+#define HAS_INT64_TO_STRING
+#define HAS_PRE_1970
+#define HAS_POST_2038
+#define HAS_STD_ISNAN
+#define HAS_STD_MUTEX
+#define HAS_BUILTIN_OVERFLOW_CHECK
+/* #undef NEEDS_REDUNDANT_MOVE */
+/* #undef NEEDS_Z_PREFIX */
+
+#include "orc/orc-config.hh"
+#include <string>
+
+#ifdef _MSC_VER
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#define timegm(tm) _mkgmtime(tm)
+#define gmtime_r(timep, result) (gmtime_s(result, timep) ? NULL : result)
+#define asctime_r(tm, buf) (asctime_s(buf, 26, tm) ? NULL : buf)
+#endif
+
+#ifndef HAS_STOLL
+  // A poor man's stoll that converts str to a long long int base 10
+  namespace std {
+    int64_t stoll(std::string str);
+  }
+#endif
+
+#ifndef HAS_STRPTIME
+  char* strptime(const char* buf, const char* format, struct tm* tm);
+#endif
+
+#ifndef HAS_PREAD
+  ssize_t pread(int fd, void* buf, size_t count, off_t offset);
+#endif
+
+#ifdef INT64_IS_LL
+  #define INT64_FORMAT_STRING "ll"
+#else
+  #define INT64_FORMAT_STRING "l"
+#endif
+
+#ifndef ORC_CXX_HAS_NOEXCEPT
+  #define noexcept ORC_NOEXCEPT
+#endif
+
+#ifndef ORC_CXX_HAS_OVERRIDE
+  #define override ORC_OVERRIDE
+#endif
+
+#ifdef HAS_DIAGNOSTIC_PUSH
+  #ifdef __clang__
+    #define DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
+    #define DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
+  #elif defined(__GNUC__)
+    #define DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
+    #define DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
+  #elif defined(_MSC_VER)
+    #define DIAGNOSTIC_PUSH __pragma(warning(push))
+    #define DIAGNOSTIC_POP __pragma(warning(pop))
+  #else
+    #error("Unknown compiler")
+  #endif
+#else
+  #define DIAGNOSTIC_PUSH
+  #define DIAGNOSTIC_POP
+#endif
+
+#define PRAGMA(TXT) _Pragma(#TXT)
+
+#if defined(_MSC_VER)
+  #define DIAGNOSTIC_IGNORE(XXX) __pragma(warning(disable : XXX))
+#elif defined(__clang__)
+  #define DIAGNOSTIC_IGNORE(XXX) PRAGMA(clang diagnostic ignored XXX)
+#elif defined(__GNUC__)
+  #define DIAGNOSTIC_IGNORE(XXX) PRAGMA(GCC diagnostic ignored XXX)
+#else
+  #define DIAGNOSTIC_IGNORE(XXX)
+#endif
+
+#ifndef ORC_CXX_HAS_UNIQUE_PTR
+  #define unique_ptr auto_ptr
+#endif
+
+#ifndef UINT32_MAX
+  #define UINT32_MAX 0xffffffff
+#endif
+
+#ifndef INT64_MAX
+  #define INT64_MAX 0x7fffffffffffffff
+#endif
+
+#ifndef INT64_MIN
+  #define INT64_MIN (-0x7fffffffffffffff - 1)
+#endif
+
+#define GTEST_LANG_CXX11 0
+
+#ifdef NEEDS_REDUNDANT_MOVE
+  #define REDUNDANT_MOVE(XXX) std::move(XXX)
+#else
+  #define REDUNDANT_MOVE(XXX) XXX
+#endif
+
+#ifndef HAS_STD_ISNAN
+  #include <math.h>
+  #define std::isnan(XXX) isnan(XXX)
+#else
+  #include <cmath>
+#endif
+
+#ifndef HAS_STD_MUTEX
+  #include <pthread.h>
+  namespace orc {
+    /**
+     * Lock guard for pthread_mutex_t object using RAII
+     * The Lock is automatically release when exiting current scope.
+     */
+    class LockORC {
+      public:
+        explicit LockORC(pthread_mutex_t& mutex) : mutex_ref_(mutex) {
+          pthread_mutex_lock(&mutex_ref_);
+        }
+        ~LockORC() { pthread_mutex_unlock(&mutex_ref_); }
+      private:
+        // no default constructor
+        LockORC();
+        // prohibit copying
+        LockORC(const LockORC&);
+        LockORC& operator=(const LockORC&);
+
+        pthread_mutex_t& mutex_ref_;
+    };
+  }
+  #define std::mutex pthread_mutex_t
+  #define std::lock_guard<std::mutex> LockORC
+#else
+  #include <mutex>
+#endif
+
+#ifdef NEEDS_Z_PREFIX
+#define Z_PREFIX 1
+#endif
+
+namespace orc {
+  std::string to_string(double val);
+  std::string to_string(int64_t val);
+}
+
+#ifdef HAS_BUILTIN_OVERFLOW_CHECK
+  #define multiplyExact !__builtin_mul_overflow
+  #define addExact !__builtin_add_overflow
+#else
+namespace orc {
+  /**
+   * Compute value * repetitions, return false if overflow, return true otherwise
+   * and save the result at the address pointed to by result
+   * imitates the jdk Math.multiplyExact implementation
+   * but this method makes the assumption that repetitions > 1
+   */
+  static bool multiplyExact(int64_t value, int64_t repetitions, int64_t* result) {
+    int64_t r = value * repetitions;
+    if (((value < 0 ? -value : value) | repetitions) >> 31 != 0 && r / repetitions != value) {
+      return false;
+    }
+    *result = r;
+    return true;
+  }
+
+  /**
+   * imitates the jdk Math.addExact implementation
+   */
+  static bool addExact(int64_t sum, int64_t increment, int64_t* result) {
+    int64_t r = sum + increment;
+    if (((sum ^ r) & (increment ^ r)) < 0) {
+      return false;
+    }
+    *result = r;
+    return true;
+  }
+}
+#endif
+
+#ifndef HAS_CONSTEXPR
+#define constexpr const
+#endif
+
+#endif /* ADAPTER_HH */
diff --git a/contrib/libs/apache/orc/c++/src/Adaptor-win.hh b/contrib/libs/apache/orc/c++/src/Adaptor-win.hh
new file mode 100644
index 0000000000..d48c24d230
--- /dev/null
+++ b/contrib/libs/apache/orc/c++/src/Adaptor-win.hh
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "Adaptor-linux.hh"
+
+#undef HAS_PREAD
+ssize_t pread(int fd, void* buf, size_t count, off_t offset);
+
+#undef HAS_BUILTIN_OVERFLOW_CHECK
diff --git a/contrib/libs/apache/orc/c++/src/Adaptor.hh b/contrib/libs/apache/orc/c++/src/Adaptor.hh
index a91b9c894d..3af1592fed 100644
--- a/contrib/libs/apache/orc/c++/src/Adaptor.hh
+++ b/contrib/libs/apache/orc/c++/src/Adaptor.hh
@@ -1,211 +1,7 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+#pragma once
 
-#ifndef ADAPTER_HH
-#define ADAPTER_HH
-
-/* #undef INT64_IS_LL */
-#define HAS_CONSTEXPR
-#ifndef _MSC_VER
-#define HAS_PREAD
-#endif
-#define HAS_STRPTIME
-#define HAS_STOLL
-#define HAS_DIAGNOSTIC_PUSH
-#define HAS_DOUBLE_TO_STRING
-#define HAS_INT64_TO_STRING
-#define HAS_PRE_1970
-#define HAS_POST_2038
-#define HAS_STD_ISNAN
-#define HAS_STD_MUTEX
-#ifndef _MSC_VER
-#define HAS_BUILTIN_OVERFLOW_CHECK
-#endif
-/* #undef NEEDS_REDUNDANT_MOVE */
-/* #undef NEEDS_Z_PREFIX */
-
-#include "orc/orc-config.hh"
-#include <string>
-
-#ifdef _MSC_VER
-#include <BaseTsd.h>
-typedef SSIZE_T ssize_t;
-#define timegm(tm) _mkgmtime(tm)
-#define gmtime_r(timep, result) (gmtime_s(result, timep) ? NULL : result)
-#define asctime_r(tm, buf) (asctime_s(buf, 26, tm) ? NULL : buf)
-#endif
-
-#ifndef HAS_STOLL
-  // A poor man's stoll that converts str to a long long int base 10
-  namespace std {
-    int64_t stoll(std::string str);
-  }
-#endif
-
-#ifndef HAS_STRPTIME
-  char* strptime(const char* buf, const char* format, struct tm* tm);
-#endif
-
-#ifndef HAS_PREAD
-  ssize_t pread(int fd, void* buf, size_t count, off_t offset);
-#endif
-
-#ifdef INT64_IS_LL
-  #define INT64_FORMAT_STRING "ll"
+#if defined(_MSC_VER)
+#   include "Adaptor-win.hh"
 #else
-  #define INT64_FORMAT_STRING "l"
-#endif
-
-#ifndef ORC_CXX_HAS_NOEXCEPT
-  #define noexcept ORC_NOEXCEPT
-#endif
-
-#ifndef ORC_CXX_HAS_OVERRIDE
-  #define override ORC_OVERRIDE
-#endif
-
-#ifdef HAS_DIAGNOSTIC_PUSH
-  #ifdef __clang__
-    #define DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
-    #define DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
-  #elif defined(__GNUC__)
-    #define DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
-    #define DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
-  #elif defined(_MSC_VER)
-    #define DIAGNOSTIC_PUSH __pragma(warning(push))
-    #define DIAGNOSTIC_POP __pragma(warning(pop))
-  #else
-    #error("Unknown compiler")
-  #endif
-#else
-  #define DIAGNOSTIC_PUSH
-  #define DIAGNOSTIC_POP
-#endif
-
-#define PRAGMA(TXT) _Pragma(#TXT)
-
-  #define DIAGNOSTIC_IGNORE(XXX)
-
-#ifndef ORC_CXX_HAS_UNIQUE_PTR
-  #define unique_ptr auto_ptr
-#endif
-
-#ifndef UINT32_MAX
-  #define UINT32_MAX 0xffffffff
+#   include "Adaptor-linux.hh"
 #endif
-
-#ifndef INT64_MAX
-  #define INT64_MAX 0x7fffffffffffffff
-#endif
-
-#ifndef INT64_MIN
-  #define INT64_MIN (-0x7fffffffffffffff - 1)
-#endif
-
-#define GTEST_LANG_CXX11 0
-
-#ifdef NEEDS_REDUNDANT_MOVE
-  #define REDUNDANT_MOVE(XXX) std::move(XXX)
-#else
-  #define REDUNDANT_MOVE(XXX) XXX
-#endif
-
-#ifndef HAS_STD_ISNAN
-  #include <math.h>
-  #define std::isnan(XXX) isnan(XXX)
-#else
-  #include <cmath>
-#endif
-
-#ifndef HAS_STD_MUTEX
-  #include <pthread.h>
-  namespace orc {
-    /**
-     * Lock guard for pthread_mutex_t object using RAII
-     * The Lock is automatically release when exiting current scope.
-     */
-    class LockORC {
-      public:
-        explicit LockORC(pthread_mutex_t& mutex) : mutex_ref_(mutex) {
-          pthread_mutex_lock(&mutex_ref_);
-        }
-        ~LockORC() { pthread_mutex_unlock(&mutex_ref_); }
-      private:
-        // no default constructor
-        LockORC();
-        // prohibit copying
-        LockORC(const LockORC&);
-        LockORC& operator=(const LockORC&);
-
-        pthread_mutex_t& mutex_ref_;
-    };
-  }
-  #define std::mutex pthread_mutex_t
-  #define std::lock_guard<std::mutex> LockORC
-#else
-  #include <mutex>
-#endif
-
-#ifdef NEEDS_Z_PREFIX
-#define Z_PREFIX 1
-#endif
-
-namespace orc {
-  std::string to_string(double val);
-  std::string to_string(int64_t val);
-}
-
-#ifdef HAS_BUILTIN_OVERFLOW_CHECK
-  #define multiplyExact !__builtin_mul_overflow
-  #define addExact !__builtin_add_overflow
-#else
-namespace orc {
-  /**
-   * Compute value * repetitions, return false if overflow, return true otherwise
-   * and save the result at the address pointed to by result
-   * imitates the jdk Math.multiplyExact implementation
-   * but this method makes the assumption that repetitions > 1
-   */
-  static bool multiplyExact(int64_t value, int64_t repetitions, int64_t* result) {
-    int64_t r = value * repetitions;
-    if (((value < 0 ? -value : value) | repetitions) >> 31 != 0 && r / repetitions != value) {
-      return false;
-    }
-    *result = r;
-    return true;
-  }
-
-  /**
-   * imitates the jdk Math.addExact implementation
-   */
-  static bool addExact(int64_t sum, int64_t increment, int64_t* result) {
-    int64_t r = sum + increment;
-    if (((sum ^ r) & (increment ^ r)) < 0) {
-      return false;
-    }
-    *result = r;
-    return true;
-  }
-}
-#endif
-
-#ifndef HAS_CONSTEXPR
-#define constexpr const
-#endif
-
-#endif /* ADAPTER_HH */