[Scummvm-git-logs] scummvm master -> 77818e968392301eacf718a56518ea1b63815c72

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
77818e9683 MT32: Fix Set-But-Unused Compiler Warning.


Commit: 77818e968392301eacf718a56518ea1b63815c72
    https://github.com/scummvm/scummvm/commit/77818e968392301eacf718a56518ea1b63815c72
Author: D G Turner (digitall at scummvm.org)
Date: 2017-01-14T09:14:02Z

Commit Message:
MT32: Fix Set-But-Unused Compiler Warning.

Changed paths:
    audio/softsynth/mt32/File.cpp
    audio/softsynth/mt32/File.h


diff --git a/audio/softsynth/mt32/File.cpp b/audio/softsynth/mt32/File.cpp
index 395a893..333230b 100755
--- a/audio/softsynth/mt32/File.cpp
+++ b/audio/softsynth/mt32/File.cpp
@@ -24,11 +24,11 @@
 
 namespace MT32Emu {
 
-AbstractFile::AbstractFile() : sha1DigestCalculated(false), reserved(NULL) {
+AbstractFile::AbstractFile() : sha1DigestCalculated(false) {
 	sha1Digest[0] = 0;
 }
 
-AbstractFile::AbstractFile(const SHA1Digest &useSHA1Digest) : sha1DigestCalculated(true), reserved(NULL) {
+AbstractFile::AbstractFile(const SHA1Digest &useSHA1Digest) : sha1DigestCalculated(true) {
 	memcpy(sha1Digest, useSHA1Digest, sizeof(SHA1Digest) - 1);
 	sha1Digest[sizeof(SHA1Digest) - 1] = 0; // Ensure terminator char.
 }
diff --git a/audio/softsynth/mt32/File.h b/audio/softsynth/mt32/File.h
index c9a7d58..f29d4f3 100755
--- a/audio/softsynth/mt32/File.h
+++ b/audio/softsynth/mt32/File.h
@@ -49,9 +49,6 @@ protected:
 private:
 	bool sha1DigestCalculated;
 	SHA1Digest sha1Digest;
-
-	// Binary compatibility helper.
-	void *reserved;
 };
 
 class MT32EMU_EXPORT ArrayFile : public AbstractFile {