update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / rocksdb / port / win / win_logger.h

diff --git a/ceph/src/rocksdb/port/win/win_logger.h b/ceph/src/rocksdb/port/win/win_logger.h
index 9e423d434a636e3f2c8c659cd5971bfb9c896958..0982f142f66c823267b5c965a96951094706ba2b 100644 (file)
--- a/ceph/src/rocksdb/port/win/win_logger.h
+++ b/ceph/src/rocksdb/port/win/win_logger.h
@@ -1,7 +1,7 @@
 //  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
+//  This source code is licensed under both the GPLv2 (found in the
+//  COPYING file in the root directory) and Apache 2.0 License
+//  (found in the LICENSE.Apache file in the root directory).
 //
 // Copyright (c) 2011 The LevelDB Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
@@ -17,7 +17,7 @@
 #include "rocksdb/env.h"
 
 #include <stdint.h>
-#include <Windows.h>
+#include <windows.h>
 
 namespace rocksdb {
 
@@ -36,8 +36,6 @@ class WinLogger : public rocksdb::Logger {
 
   WinLogger& operator=(const WinLogger&) = delete;
 
-  void close();
-
   void Flush() override;
 
   using rocksdb::Logger::Logv;
@@ -47,6 +45,10 @@ class WinLogger : public rocksdb::Logger {
 
   void DebugWriter(const char* str, int len);
 
+protected:
+
+    Status CloseImpl() override;
+
  private:
   HANDLE file_;
   uint64_t (*gettid_)();  // Return the thread id for the current thread
@@ -55,6 +57,8 @@ class WinLogger : public rocksdb::Logger {
   Env* env_;
   bool flush_pending_;
 
+  Status CloseInternal();
+
   const static uint64_t flush_every_seconds_ = 5;
 };