ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/SheepShaver/src/include/ether_defs.h

Comparing SheepShaver/src/include/ether_defs.h (file contents):
Revision 1.4 by gbeauche, 2004-05-10T15:42:35Z vs.
Revision 1.5 by gbeauche, 2004-12-18T18:43:25Z

#	Line 248 | Line 248 | class nw_scalar_member_helper {
248		uint8 _pad[sizeof(type)];
249		public:
250		operator public_type () const {
251	<	return (public_type)nw_memory_helper<sizeof(type)>::load((void *)this);
251	>	return (public_type)(uintptr)nw_memory_helper<sizeof(type)>::load((void *)this);
252		}
253		public_type operator -> () const {
254		return this->operator public_type ();
255		}
256		nw_scalar_member_helper<type, public_type> & operator = (public_type val) {
257	<	nw_memory_helper<sizeof(type)>::store((void *)this, (type)val);
257	>	nw_memory_helper<sizeof(type)>::store((void *)this, (type)(uintptr)val);
258		return *this;
259		}
260		nw_scalar_member_helper<type, public_type> & operator += (int val) {

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines