andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Address review comments

Browse Source 
Rule of five: add destructor
 Add a note to COMMIT.md for 3rd party json.
This commit is contained in:
Dmitri Smirnov 2015-07-10 15:20:58 -07:00
parent c903ccc4c2
commit 296de4ae6d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/rocksdb/transaction_log.h
View File

@ -59,9 +59,15 @@ struct BatchResult {
SequenceNumber sequence = 0; SequenceNumber sequence = 0;
std::unique_ptr<WriteBatch> writeBatchPtr; std::unique_ptr<WriteBatch> writeBatchPtr;
// Add empty __ctor and __dtor for the rule of five
// However, preserve the original semantics and prohibit copying
// as the unique_ptr member does not copy.
BatchResult() { BatchResult() {
} }
~BatchResult() {
}
BatchResult(const BatchResult&) = delete; BatchResult(const BatchResult&) = delete;
BatchResult& operator=(const BatchResult&) = delete; BatchResult& operator=(const BatchResult&) = delete;

3
third-party/fbson/COMMIT.md vendored
View File

@ -1,2 +1,5 @@
fbson commit: fbson commit:
https://github.com/facebook/mysql-5.6/commit/55ef9ff25c934659a70b4094e9b406c48e9dd43d https://github.com/facebook/mysql-5.6/commit/55ef9ff25c934659a70b4094e9b406c48e9dd43d
# TODO.
* Had to convert zero sized array to [1] sized arrays due to the fact that MS Compiler complains about it not being standard. At some point need to contribute this change back to MySql where this code was taken from.