Abandon ROCKSDB_WARNING
Summary: My latest fix to pragma_error.h caused compilation errors for another internal project. I am now unable to figure out how to get pragma_error working on all platforms and build environments (nor am I able to test any other options). Seems like the best option is to get rid of this macro. include/utilities has been deprecated for a year now, so lets just deal with a breaking change in 3.13 to remove these files. And I guess we'll have to live with having an extra convenience.h. Thoughts? Test Plan: build Reviewers: igor, yhchiang, kradhakrishnan, IslamAbdelRahman, sdong Reviewed By: sdong Subscribers: dhruba, leveldb Differential Revision: https://reviews.facebook.net/D42597
This commit is contained in:
agiardullo
parent
4922af6f8d
commit
6002801e09
@ -5,8 +5,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "rocksdb/utilities/pragma_error.h"
|
// This file was moved to rocksdb/convenience.h"
|
||||||
|
|
||||||
ROCKSDB_WARNING("This file was moved to rocksdb/convenience.h")
|
|
||||||
|
|
||||||
#include "rocksdb/convenience.h"
|
#include "rocksdb/convenience.h"
|
||||||
|
|||||||
@ -1,36 +0,0 @@
|
|||||||
// Copyright (c) 2013, 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.
|
|
||||||
//
|
|
||||||
// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
|
|
||||||
// Use of this source code is governed by a BSD-style license that can be
|
|
||||||
// found in the LICENSE file. See the AUTHORS file for names of contributors.
|
|
||||||
|
|
||||||
#ifndef STORAGE_LEVELDB_UTILITIES_PRAGMA_ERROR_H_
|
|
||||||
#define STORAGE_LEVELDB_UTILITIES_PRAGMA_ERROR_H_
|
|
||||||
|
|
||||||
#define RDB_STR__(x) #x
|
|
||||||
#define RDB_STR(x) RDB_STR__(x)
|
|
||||||
|
|
||||||
#if defined(__GNUC__) || defined(__clang__)
|
|
||||||
// Wrap unportable warning macro
|
|
||||||
|
|
||||||
#define ROCKSDB_WARNING(x) _Pragma(RDB_STR(GCC warning x))
|
|
||||||
|
|
||||||
#elif defined(_WIN32)
|
|
||||||
|
|
||||||
// Wrap unportable warning macro
|
|
||||||
#if defined(_MSC_VER)
|
|
||||||
// format it according to visual studio output (to get source lines and warnings
|
|
||||||
// in the IDE)
|
|
||||||
#define ROCKSDB_WARNING(x) \
|
|
||||||
__pragma(message(__FILE__ "(" RDB_STR(__LINE__) ") : warning: " x))
|
|
||||||
#else
|
|
||||||
// make #warning into #pragma GCC warning gcc 4.7+ and clang 3.2+ supported
|
|
||||||
#define ROCKSDB_WARNING(x) _Pragma(RDB_STR(GCC warning(x)))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // STORAGE_LEVELDB_UTILITIES_PRAGMA_ERROR_H_
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
// Copyright (c) 2013, 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.
|
|
||||||
//
|
|
||||||
// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
|
|
||||||
// Use of this source code is governed by a BSD-style license that can be
|
|
||||||
// found in the LICENSE file. See the AUTHORS file for names of contributors.
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "rocksdb/utilities/pragma_error.h"
|
|
||||||
|
|
||||||
ROCKSDB_WARNING(
|
|
||||||
"Warning: This file was moved to rocksdb/utilities/backupable_db.h")
|
|
||||||
|
|
||||||
#include "rocksdb/utilities/backupable_db.h"
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
// Copyright (c) 2013, 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.
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "rocksdb/utilities/pragma_error.h"
|
|
||||||
|
|
||||||
ROCKSDB_WARNING("This file was moved to rocksdb/utilities/db_ttl.h")
|
|
||||||
|
|
||||||
#include "rocksdb/utilities/db_ttl.h"
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
// Copyright (c) 2013, 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.
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "rocksdb/utilities/pragma_error.h"
|
|
||||||
|
|
||||||
ROCKSDB_WARNING("This file was moved to rocksdb/utilities/document_db.h")
|
|
||||||
|
|
||||||
#include "rocksdb/utilities/document_db.h"
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
// Copyright (c) 2013, 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.
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "rocksdb/utilities/pragma_error.h"
|
|
||||||
|
|
||||||
ROCKSDB_WARNING("This file was moved to rocksdb/utilities/geo_db.h")
|
|
||||||
|
|
||||||
#include "rocksdb/utilities/geo_db.h"
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
// Copyright (c) 2013, 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.
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "rocksdb/utilities/pragma_error.h"
|
|
||||||
|
|
||||||
ROCKSDB_WARNING("This file was moved to rocksdb/utilities/json_document.h")
|
|
||||||
|
|
||||||
#include "rocksdb/utilities/json_document.h"
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
|
|
||||||
// Use of this source code is governed by a BSD-style license that can be
|
|
||||||
// found in the LICENSE file. See the AUTHORS file for names of contributors.
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
#include "rocksdb/utilities/pragma_error.h"
|
|
||||||
|
|
||||||
ROCKSDB_WARNING("This file was moved to rocksdb/utilities/stackable_db.h")
|
|
||||||
|
|
||||||
#include "rocksdb/utilities/stackable_db.h"
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
|
|
||||||
// Use of this source code is governed by a BSD-style license that can be
|
|
||||||
// found in the LICENSE file. See the AUTHORS file for names of contributors.
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "rocksdb/utilities/pragma_error.h"
|
|
||||||
|
|
||||||
ROCKSDB_WARNING("This file was moved to rocksdb/utilities/utility_db.h")
|
|
||||||
|
|
||||||
#include "rocksdb/utilities/utility_db.h"
|
|
||||||
Loading…
Reference in New Issue
Block a user