[patch] Fixes for gcc 3.4.4

pose_gcc_344.diff (text/plain), 4.32 KB, created by Ovidiu Bivolaru on 2005-12-14 17:48:53 UTC

diff -Naur Emulator_Src_3.5.orig/SrcShared/EmStream.h Emulator_Src_3.5/SrcShared/EmStream.h
--- Emulator_Src_3.5.orig/SrcShared/EmStream.h	2002-03-29 15:11:14.000000000 +0200
+++ Emulator_Src_3.5/SrcShared/EmStream.h	2005-12-15 02:26:02.000000000 +0200
@@ -90,7 +90,7 @@
 
 									container.resize (numElements);
 
-									deque<T>::iterator	iter = container.begin ();
+									typename deque<T>::iterator	iter = container.begin ();
 									while (iter != container.end ())
 									{
 										*this >> *iter;
@@ -108,7 +108,7 @@
 
 									container.resize (numElements);
 
-									list<T>::iterator	iter = container.begin ();
+									typename list<T>::iterator	iter = container.begin ();
 									while (iter != container.end ())
 									{
 										*this >> *iter;
@@ -126,7 +126,7 @@
 
 									container.resize (numElements);
 
-									vector<T>::iterator	iter = container.begin ();
+									typename vector<T>::iterator	iter = container.begin ();
 									while (iter != container.end ())
 									{
 										*this >> *iter;
@@ -143,7 +143,7 @@
 
 									*this << numElements;
 
-									deque<T>::const_iterator	iter = container.begin ();
+									typename deque<T>::const_iterator	iter = container.begin ();
 									while (iter != container.end ())
 									{
 										*this << *iter;
@@ -160,7 +160,7 @@
 
 									*this << numElements;
 
-									list<T>::const_iterator	iter = container.begin ();
+									typename list<T>::const_iterator	iter = container.begin ();
 									while (iter != container.end ())
 									{
 										*this << *iter;
@@ -177,7 +177,7 @@
 
 									*this << numElements;
 
-									vector<T>::const_iterator	iter = container.begin ();
+									typename vector<T>::const_iterator	iter = container.begin ();
 									while (iter != container.end ())
 									{
 										*this << *iter;
diff -Naur Emulator_Src_3.5.orig/SrcShared/Hardware/EmRegsEZTRGpro.cpp Emulator_Src_3.5/SrcShared/Hardware/EmRegsEZTRGpro.cpp
--- Emulator_Src_3.5.orig/SrcShared/Hardware/EmRegsEZTRGpro.cpp	2002-03-29 15:11:18.000000000 +0200
+++ Emulator_Src_3.5/SrcShared/Hardware/EmRegsEZTRGpro.cpp	2005-12-15 02:37:17.000000000 +0200
@@ -229,7 +229,7 @@
 void EmRegsEZTRGpro::SetSubBankHandlers(void)
 {
 	EmRegsEZ::SetSubBankHandlers();
-	this->SetHandler((ReadFunction)&EmRegs::StdRead,
+	this->SetHandler((ReadFunction)&EmRegsEZTRGpro::StdRead,
                          (WriteFunction)&EmRegsEZTRGpro::spiWrite,
 	                 addressof(spiMasterData),
 	                 sizeof(f68EZ328Regs.spiMasterData));
diff -Naur Emulator_Src_3.5.orig/SrcShared/Hardware/EmRegsVZHandEra330.cpp Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZHandEra330.cpp
--- Emulator_Src_3.5.orig/SrcShared/Hardware/EmRegsVZHandEra330.cpp	2002-03-29 15:11:19.000000000 +0200
+++ Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZHandEra330.cpp	2005-12-15 02:56:44.000000000 +0200
@@ -588,14 +588,14 @@
 
     // SD support
 	this->SetHandler((ReadFunction)&EmRegsVZHandEra330::spiRxDRead,
-                         (WriteFunction)&EmRegsVZ::StdWrite,
+                         (WriteFunction)&EmRegsVZHandEra330::StdWrite,
 	                 addressof(spiRxD),
 	                 sizeof(UInt16));
-	this->SetHandler((ReadFunction)&EmRegsVZ::StdRead,
+	this->SetHandler((ReadFunction)&EmRegsVZHandEra330::StdRead,
                          (WriteFunction)&EmRegsVZHandEra330::spiTxDWrite,
 	                 addressof(spiTxD),
 	                 sizeof(UInt16));
-	this->SetHandler((ReadFunction)&EmRegsVZ::StdRead,
+	this->SetHandler((ReadFunction)&EmRegsVZHandEra330::StdRead,
                          (WriteFunction)&EmRegsVZHandEra330::spiCont1Write,
 	                 addressof(spiCont1),
 	                 sizeof(UInt16));
diff -Naur Emulator_Src_3.5.orig/SrcShared/Hardware/EmRegsVZPalmM505.cpp Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZPalmM505.cpp
--- Emulator_Src_3.5.orig/SrcShared/Hardware/EmRegsVZPalmM505.cpp	2002-03-29 15:11:19.000000000 +0200
+++ Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZPalmM505.cpp	2005-12-15 03:04:53.000000000 +0200
@@ -50,7 +50,7 @@
 
 	// Now add standard/specialized handers for the defined registers.
 
-	this->SetHandler ((ReadFunction) &EmRegsVZ::StdRead,
+	this->SetHandler ((ReadFunction) &EmRegsVZPalmM505::StdRead,
 		(WriteFunction) &EmRegsVZPalmM505::portFSelectWrite,
 		addressof (portFSelect), sizeof (f68VZ328Regs.portFSelect));
 }