Merge branch 'master' into jsonrpc2

2016-02-19 12:52:16 +01:00
parent ed880b3b58 57ef5e2691
commit ef8055f900
30 changed files with 424 additions and 369 deletions
--- a/ethcore/src/receipt.rs
+++ b/ethcore/src/receipt.rs
@@ -39,7 +39,7 @@ impl Receipt {
 		Receipt {
 			state_root: state_root,
 			gas_used: gas_used,
-			log_bloom: logs.iter().fold(LogBloom::new(), |mut b, l| { b |= &l.bloom(); b }),
+			log_bloom: logs.iter().fold(LogBloom::new(), |mut b, l| { b = &b | &l.bloom(); b }), //TODO: use |= operator
 			logs: logs,
 		}
 	}