[Gemrb-commits] gemrb: branch master updated. 850e2b438a1ced143d9da86f44b6bab910162bb5

[Tom <rtp...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  850e2b438a1ced143d9da86f44b6bab910162bb5 (commit)

Summary of changes:
 gemrb/core/Variables.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
      from  950bd8d58c4fe59b1b9e2d979eac7d63d776a6b7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=850e2b438a1ced143d9da86f44b6bab910162bb5

commit 850e2b438a1ced143d9da86f44b6bab910162bb5
Author: Tom Prince <tom...@ua...>
Date:   Tue Jun 1 13:23:45 2010 -0400

    Fix alignment warning armv6j.
    
    This is actually a problem, but it is easy to fix.
    
    Signed-off-by: Tom Prince <tom...@ua...>

diff --git a/gemrb/core/Variables.h b/gemrb/core/Variables.h
index 28c3d89..a3f6ea9 100644
--- a/gemrb/core/Variables.h
+++ b/gemrb/core/Variables.h
@@ -42,7 +42,7 @@ typedef void (*ReleaseFun)(void *);
 class GEM_EXPORT Variables {
 protected:
 	// Association
-	struct MyAssoc {
+	class MyAssoc {
 		MyAssoc* pNext;
 		char* key;
 		union {
@@ -51,14 +51,14 @@ protected:
 			void* pValue;
 		} Value;
 		unsigned long nHashValue;
+		friend class Variables;
 	};
 	struct MemBlock {
 		MemBlock* pNext;
 	};
 public:
 	// abstract iteration position
-	typedef struct POS {
-	} *iterator;
+	typedef MyAssoc *iterator;
 public:
 	// Construction
 	Variables(int nBlockSize = 10, int nHashTableSize = 2049);

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator