Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
 Rule of five: add destructor
 Add a note to COMMIT.md for 3rd party json.
  • Loading branch information
yuslepukhin committed Jul 10, 2015
1 parent c903ccc commit 296de4a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
6 changes: 6 additions & 0 deletions include/rocksdb/transaction_log.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,15 @@ struct BatchResult {
SequenceNumber sequence = 0;
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(const BatchResult&) = delete;

BatchResult& operator=(const BatchResult&) = delete;
Expand Down
3 changes: 3 additions & 0 deletions third-party/fbson/COMMIT.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
fbson commit:
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.

0 comments on commit 296de4a

Please sign in to comment.