Skip to content

Commit 6745ca9

Browse files
committed
Merge branch 'release/0.5.0'
2 parents b48f75b + d511714 commit 6745ca9

File tree

60 files changed

+2837
-341
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2837
-341
lines changed

ObjectiveRocks.xcodeproj/project.pbxproj

Lines changed: 256 additions & 187 deletions
Large diffs are not rendered by default.

ObjectiveRocks.xcodeproj/xcshareddata/xcschemes/ObjectiveRocks-iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ObjectiveRocks.xcodeproj/xcshareddata/xcschemes/ObjectiveRocks.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ObjectiveRocks.xcodeproj/xcshareddata/xcschemes/ObjectiveRocksTests-iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ObjectiveRocks.xcodeproj/xcshareddata/xcschemes/ObjectiveRocksTests.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ObjectiveRocks/RocksDB+Private.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,31 @@ namespace rocksdb {
1313
class ColumnFamilyHandle;
1414
}
1515

16+
/**
17+
This category is intended to hide all C++ types from the public interface in order to
18+
maintain a pure Objective-C API for Swift compatibility.
19+
*/
1620
@interface RocksDB (Private)
1721

22+
/** @brief The underlying rocks::DB instance. */
1823
@property (nonatomic, assign) rocksdb::DB *db;
24+
25+
/** @brief The underlying rocksdb::ColumnFamilyHandle associated with this instance. */
1926
@property (nonatomic, assign) rocksdb::ColumnFamilyHandle *columnFamily;
27+
28+
/** @brief The DB options.
29+
@see RocksDBOptions
30+
*/
2031
@property (nonatomic, retain) RocksDBOptions *options;
32+
33+
/** @brief The read options.
34+
@see RocksDBReadOptions
35+
*/
2136
@property (nonatomic, retain) RocksDBReadOptions *readOptions;
37+
38+
/** @brief The write options
39+
@see RocksDBWriteOptions
40+
*/
2241
@property (nonatomic, retain) RocksDBWriteOptions *writeOptions;
2342

2443
@end

0 commit comments

Comments
 (0)