From c454bb9c1420f120164fff98ab99dd253b39d61d Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Fri, 15 Jul 2011 18:46:11 -0400
Subject: [PATCH] [timing] Slightly (?) better (??) casting.

---
 src/NotesLoaderJson.cpp | 8 ++++----
 src/NotesWriterJson.cpp | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/NotesLoaderJson.cpp b/src/NotesLoaderJson.cpp
index 3727b7a53c..d113e2105c 100644
--- a/src/NotesLoaderJson.cpp
+++ b/src/NotesLoaderJson.cpp
@@ -17,14 +17,14 @@ void NotesLoaderJson::GetApplicableFiles( const RString &sPath, vector<RString>
 
 static void Deserialize(TimingSegment &seg, const Json::Value &root)
 {
-	(&seg)->SetBeat((float)(root["Beat"].asDouble()));
-	if ((&seg)->GetType() == SEGMENT_BPM)
+	seg.SetBeat((float)(root["Beat"].asDouble()));
+	if (seg.GetType() == SEGMENT_BPM)
 	{
-		static_cast<BPMSegment *>(&seg)->SetBPM((float)(root["BPM"].asDouble()));
+		static_cast<BPMSegment &>(seg).SetBPM((float)(root["BPM"].asDouble()));
 	}
 	else
 	{
-		static_cast<StopSegment *>(&seg)->SetPause((float)(root["Seconds"].asDouble()));
+		static_cast<StopSegment &>(seg).SetPause((float)(root["Seconds"].asDouble()));
 	}
 }
 
diff --git a/src/NotesWriterJson.cpp b/src/NotesWriterJson.cpp
index 26cc3a28b3..984a895295 100644
--- a/src/NotesWriterJson.cpp
+++ b/src/NotesWriterJson.cpp
@@ -11,14 +11,14 @@
 
 static void Serialize(const TimingSegment &seg, Json::Value &root)
 {
-	root["Beat"] = (&seg)->GetBeat();
-	if ((&seg)->GetType() == SEGMENT_BPM)
+	root["Beat"] = seg.GetBeat();
+	if (seg.GetType() == SEGMENT_BPM)
 	{
-		root["BPM"] = static_cast<BPMSegment *>(const_cast<TimingSegment *>(&seg))->GetBPM();
+		root["BPM"] = static_cast<BPMSegment &>(const_cast<TimingSegment &>(seg)).GetBPM();
 	}
 	else
 	{
-		root["Seconds"] = static_cast<StopSegment *>(const_cast<TimingSegment *>(&seg))->GetPause();
+		root["Seconds"] = static_cast<StopSegment &>(const_cast<TimingSegment &>(seg)).GetPause();
 	}
 }