Commit 08b4add1 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

#4015 fix the icc compilation problem with a private static db refs[t:4015]

git-svn-id: file:///svn/toku/tokudb@37922 c7de825b-a66e-492c-adef-691d508d4ae1
parent ecb2859a
...@@ -983,8 +983,8 @@ int toku_brtnode_pf_callback(void* brtnode_pv, void* read_extraargs, int fd, PAI ...@@ -983,8 +983,8 @@ int toku_brtnode_pf_callback(void* brtnode_pv, void* read_extraargs, int fd, PAI
// Copy the descriptor into a temporary variable, and tell DRD that subsequent code happens after reading that pointer. // Copy the descriptor into a temporary variable, and tell DRD that subsequent code happens after reading that pointer.
// In combination with the annotation in toku_update_descriptor, this seems to be enough to convince test_4015 that all is well. // In combination with the annotation in toku_update_descriptor, this seems to be enough to convince test_4015 that all is well.
// Otherwise, drd complains that the newly malloc'd descriptor string is touched later by some comparison operation. // Otherwise, drd complains that the newly malloc'd descriptor string is touched later by some comparison operation.
static const struct __toku_db zero_db; // it's static, so it's all zeros. icc needs this to be a global
static inline void setup_fake_db (DB *fake_db, DESCRIPTOR fake_desc, DESCRIPTOR orig_desc) { static inline void setup_fake_db (DB *fake_db, DESCRIPTOR fake_desc, DESCRIPTOR orig_desc) {
static const struct __toku_db zero_db; // it's static, so it's all zeros.
*fake_db = zero_db; *fake_db = zero_db;
if (orig_desc) { if (orig_desc) {
fake_db->descriptor = fake_desc; fake_db->descriptor = fake_desc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment