From d4b31544fcd3cd87077d6b5b32685dc885cd8d33 Mon Sep 17 00:00:00 2001
From: Determinant <ted.sybil@gmail.com>
Date: Mon, 8 Jan 2018 19:54:41 +0800
Subject: change size_of consts to macros to support stable rustc

---
 src/apu.rs | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'src/apu.rs')

diff --git a/src/apu.rs b/src/apu.rs
index 7777f68..f801ffb 100644
--- a/src/apu.rs
+++ b/src/apu.rs
@@ -720,18 +720,19 @@ pub struct APU<'a> {
     spkr: &'a mut Speaker,
 }
 
-const APU_IGNORED_SIZE: usize =
-    size_of::<Pulse>() +
-    size_of::<Pulse>() +
-    size_of::<Triangle>() +
-    size_of::<Noise>() +
-    size_of::<DMC>() +
-    size_of::<LPFilter>() +
-    size_of::<HPFilter>() +
-    size_of::<HPFilter>() +
-    size_of::<Sampler>() +
-    size_of::<Sampler>() +
-    size_of::<&Speaker>();
+macro_rules! APU_IGNORED_SIZE {
+    () => (size_of::<Pulse>() +
+        size_of::<Pulse>() +
+        size_of::<Triangle>() +
+        size_of::<Noise>() +
+        size_of::<DMC>() +
+        size_of::<LPFilter>() +
+        size_of::<HPFilter>() +
+        size_of::<HPFilter>() +
+        size_of::<Sampler>() +
+        size_of::<Sampler>() +
+        size_of::<&Speaker>())
+}
 
 impl<'a> APU<'a> {
     pub fn new(spkr: &'a mut Speaker) -> Self {
@@ -752,7 +753,7 @@ impl<'a> APU<'a> {
     }
 
     pub fn load(&mut self, reader: &mut Read) -> bool {
-        load_prefix(self, APU_IGNORED_SIZE, reader) &&
+        load_prefix(self, APU_IGNORED_SIZE!(), reader) &&
         self.pulse1.load(reader) &&
         self.pulse2.load(reader) &&
         self.triangle.load(reader) &&
@@ -766,7 +767,7 @@ impl<'a> APU<'a> {
     }
 
     pub fn save(&self, writer: &mut Write) -> bool {
-        save_prefix(self, APU_IGNORED_SIZE, writer) &&
+        save_prefix(self, APU_IGNORED_SIZE!(), writer) &&
         self.pulse1.save(writer) &&
         self.pulse2.save(writer) &&
         self.triangle.save(writer) &&
-- 
cgit v1.2.3-70-g09d2