Make kMajorVersion and kMinorVersion take version from version macros

main
Igor Canadi 11 years ago
parent 6cb0cb300c
commit e525bb16ea
  1. 2
      Makefile
  2. 3
      README.fb
  3. 5
      include/rocksdb/db.h
  4. 1
      include/rocksdb/version.h

@ -147,7 +147,7 @@ SHARED3 = $(SHARED1)
SHARED = $(SHARED1)
else
# Update db.h if you change these.
SHARED_MAJOR = 2
SHARED_MAJOR = 3
SHARED_MINOR = 0
SHARED1 = ${LIBNAME}.$(PLATFORM_SHARED_EXT)
SHARED2 = $(SHARED1).$(SHARED_MAJOR)

@ -1,3 +0,0 @@
* Detailed instructions on how to compile using fbcode and jemalloc
* Latest release is 2.7.fb

@ -41,9 +41,8 @@ struct ColumnFamilyDescriptor {
: name(_name), options(_options) {}
};
// Update Makefile if you change these
static const int kMajorVersion = 3;
static const int kMinorVersion = 0;
static const int kMajorVersion = __ROCKSDB_MAJOR__;
static const int kMinorVersion = __ROCKSDB_MINOR__;
struct Options;
struct ReadOptions;

@ -1,5 +1,6 @@
#pragma once
// Also update Makefile if you change these
#define __ROCKSDB_MAJOR__ 3
#define __ROCKSDB_MINOR__ 0
#define __ROCKSDB_PATCH__ 0

Loading…
Cancel
Save