[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System Boolean.cs,1.6,1.7 Byt
|
From: |
Rhys Weatherley <address@hidden> |
|
Subject: |
[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System Boolean.cs,1.6,1.7 Byte.cs,1.7,1.8 Char.cs,1.5,1.6 DateTime.cs,1.15,1.16 Double.cs,1.7,1.8 Int16.cs,1.8,1.9 Int32.cs,1.8,1.9 Int64.cs,1.7,1.8 IntPtr.cs,1.6,1.7 RuntimeArgumentHandle.cs,1.2,1.3 RuntimeFieldHandle.cs,1.3,1.4 RuntimeMethodHandle.cs,1.5,1.6 RuntimeTypeHandle.cs,1.3,1.4 SByte.cs,1.8,1.9 Single.cs,1.7,1.8 TimeSpan.cs,1.6,1.7 UInt16.cs,1.7,1.8 UInt32.cs,1.7,1.8 UInt64.cs,1.7,1.8 UIntPtr.cs,1.7,1.8 |
|
Date: |
Mon, 25 Nov 2002 23:00:38 -0500 |
Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System
In directory subversions:/tmp/cvs-serv412/runtime/System
Modified Files:
Boolean.cs Byte.cs Char.cs DateTime.cs Double.cs Int16.cs
Int32.cs Int64.cs IntPtr.cs RuntimeArgumentHandle.cs
RuntimeFieldHandle.cs RuntimeMethodHandle.cs
RuntimeTypeHandle.cs SByte.cs Single.cs TimeSpan.cs UInt16.cs
UInt32.cs UInt64.cs UIntPtr.cs
Log Message:
Rename "value__" to "value_" so that MS'es "peverify" doesn't get confused.
Index: Boolean.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Boolean.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Boolean.cs 20 Apr 2002 00:50:56 -0000 1.6
--- Boolean.cs 26 Nov 2002 04:00:35 -0000 1.7
***************
*** 27,31 ****
#endif
{
! private bool value__;
public static readonly String TrueString = "True";
--- 27,31 ----
#endif
{
! private bool value_;
public static readonly String TrueString = "True";
***************
*** 34,43 ****
// Override inherited methods.
public override int GetHashCode()
! { return (value__ ? 1 : 0); }
public override bool Equals(Object value)
{
if(value is Boolean)
{
! return (value__ ==
((Boolean)value).value__);
}
else
--- 34,43 ----
// Override inherited methods.
public override int GetHashCode()
! { return (value_ ? 1 : 0); }
public override bool Equals(Object value)
{
if(value is Boolean)
{
! return (value_ ==
((Boolean)value).value_);
}
else
***************
*** 50,58 ****
public override String ToString()
{
! return (value__ ? TrueString : FalseString);
}
public String ToString(IFormatProvider provider)
{
! return (value__ ? TrueString : FalseString);
}
--- 50,58 ----
public override String ToString()
{
! return (value_ ? TrueString : FalseString);
}
public String ToString(IFormatProvider provider)
{
! return (value_ ? TrueString : FalseString);
}
***************
*** 96,105 ****
throw new
ArgumentException(_("Arg_MustBeBoolean"));
}
! bool other = ((Boolean)value).value__;
! if(value__ == other)
{
return 0;
}
! else if(value__)
{
return 1;
--- 96,105 ----
throw new
ArgumentException(_("Arg_MustBeBoolean"));
}
! bool other = ((Boolean)value).value_;
! if(value_ == other)
{
return 0;
}
! else if(value_)
{
return 1;
***************
*** 125,145 ****
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return value__;
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value__);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value__);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value__);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value__);
}
char IConvertible.ToChar(IFormatProvider provider)
--- 125,145 ----
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return value_;
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value_);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value_);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value_);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value_);
}
char IConvertible.ToChar(IFormatProvider provider)
***************
*** 151,179 ****
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value__);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value__);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value__);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value__);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value__);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value__);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value__);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
--- 151,179 ----
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value_);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value_);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value_);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value_);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value_);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value_);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value_);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
Index: Byte.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Byte.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Byte.cs 5 Oct 2002 06:53:57 -0000 1.7
--- Byte.cs 26 Nov 2002 04:00:35 -0000 1.8
***************
*** 30,34 ****
#endif
{
! private byte value__;
public const byte MaxValue = 255;
--- 30,34 ----
#endif
{
! private byte value_;
public const byte MaxValue = 255;
***************
*** 37,46 ****
// Override inherited methods.
public override int GetHashCode()
! { return (int)value__; }
public override bool Equals(Object value)
{
if(value is Byte)
{
! return (value__ ==
((Byte)value).value__);
}
else
--- 37,46 ----
// Override inherited methods.
public override int GetHashCode()
! { return (int)value_; }
public override bool Equals(Object value)
{
if(value is Byte)
{
! return (value_ == ((Byte)value).value_);
}
else
***************
*** 54,58 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, null,
NumberFormatInfo.CurrentInfo);
}
--- 54,58 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, null,
NumberFormatInfo.CurrentInfo);
}
***************
*** 60,64 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, format,
NumberFormatInfo.CurrentInfo);
}
--- 60,64 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, format,
NumberFormatInfo.CurrentInfo);
}
***************
*** 66,70 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, null,
NumberFormatInfo.GetInstance(provider));
}
--- 66,70 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, null,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 72,76 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, format,
NumberFormatInfo.GetInstance(provider));
}
--- 72,76 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, format,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 106,110 ****
throw new
ArgumentException(_("Arg_MustBeByte"));
}
! return ((int)value__) -
((int)((Byte)value).value__);
}
else
--- 106,110 ----
throw new
ArgumentException(_("Arg_MustBeByte"));
}
! return ((int)value_) -
((int)((Byte)value).value_);
}
else
***************
*** 123,175 ****
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value__);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return value__;
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value__);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value__);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value__);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value__);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value__);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value__);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value__);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value__);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value__);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value__);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value__);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
--- 123,175 ----
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value_);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return value_;
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value_);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value_);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value_);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value_);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value_);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value_);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value_);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value_);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value_);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value_);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value_);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
Index: Char.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Char.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Char.cs 20 Apr 2002 00:50:56 -0000 1.5
--- Char.cs 26 Nov 2002 04:00:35 -0000 1.6
***************
*** 29,33 ****
#endif
{
! private char value__;
public const char MaxValue = '\uFFFF';
--- 29,33 ----
#endif
{
! private char value_;
public const char MaxValue = '\uFFFF';
***************
*** 36,45 ****
// Override inherited methods.
public override int GetHashCode()
! { return unchecked(((int)value__) | (((int)value__) <<
16)); }
public override bool Equals(Object value)
{
if(value is Char)
{
! return (value__ ==
((Char)value).value__);
}
else
--- 36,45 ----
// Override inherited methods.
public override int GetHashCode()
! { return unchecked(((int)value_) | (((int)value_) <<
16)); }
public override bool Equals(Object value)
{
if(value is Char)
{
! return (value_ == ((Char)value).value_);
}
else
***************
*** 52,60 ****
public override String ToString()
{
! return new String (value__, 1);
}
public String ToString(IFormatProvider provider)
{
! return new String (value__, 1);
}
#if !ECMA_COMPAT
--- 52,60 ----
public override String ToString()
{
! return new String (value_, 1);
}
public String ToString(IFormatProvider provider)
{
! return new String (value_, 1);
}
#if !ECMA_COMPAT
***************
*** 94,98 ****
throw new
ArgumentException(_("Arg_MustBeChar"));
}
! return ((int)value__) -
((int)(((Char)value).value__));
}
else
--- 94,98 ----
throw new
ArgumentException(_("Arg_MustBeChar"));
}
! return ((int)value_) -
((int)(((Char)value).value_));
}
else
***************
*** 117,153 ****
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value__);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value__);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value__);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value__);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return value__;
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value__);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value__);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value__);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value__);
}
float IConvertible.ToSingle(IFormatProvider provider)
--- 117,153 ----
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value_);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value_);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value_);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value_);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return value_;
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value_);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value_);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value_);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value_);
}
float IConvertible.ToSingle(IFormatProvider provider)
Index: DateTime.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/DateTime.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** DateTime.cs 5 Nov 2002 00:51:40 -0000 1.15
--- DateTime.cs 26 Nov 2002 04:00:35 -0000 1.16
***************
*** 34,38 ****
{
! private long value__;
// Days in each month in regular years.
--- 34,38 ----
{
! private long value_;
// Days in each month in regular years.
***************
*** 127,131 ****
if(ticks >= 0 && ticks <= maxTicks)
{
! value__ = ticks;
}
else
--- 127,131 ----
if(ticks >= 0 && ticks <= maxTicks)
{
! value_ = ticks;
}
else
***************
*** 137,146 ****
public DateTime(int year, int month, int day)
{
! value__ = DateToTicks(year, month, day);
}
public DateTime(int year, int month, int day,
int hour, int minute, int second)
{
! value__ = DateToTicks(year, month, day) +
TimeToTicks(hour, minute,
second);
}
--- 137,146 ----
public DateTime(int year, int month, int day)
{
! value_ = DateToTicks(year, month, day);
}
public DateTime(int year, int month, int day,
int hour, int minute, int second)
{
! value_ = DateToTicks(year, month, day) +
TimeToTicks(hour, minute,
second);
}
***************
*** 150,157 ****
unchecked
{
! value__ = DateToTicks(year, month, day)
+
TimeToTicks(hour,
minute, second) +
((long)millisecond) *
10000L;
! if(value__ < 0 || value__ > maxTicks)
{
throw new
ArgumentException(_("Arg_DateTimeRange"));
--- 150,157 ----
unchecked
{
! value_ = DateToTicks(year, month, day) +
TimeToTicks(hour,
minute, second) +
((long)millisecond) *
10000L;
! if(value_ < 0 || value_ > maxTicks)
{
throw new
ArgumentException(_("Arg_DateTimeRange"));
***************
*** 181,185 ****
throw new
ArgumentNullException("calendar");
}
! value__ = calendar.ToDateTime(year, month, day,
hour,
minute, second, millisecond,
Calendar.CurrentEra)
--- 181,185 ----
throw new
ArgumentNullException("calendar");
}
! value_ = calendar.ToDateTime(year, month, day,
hour,
minute, second, millisecond,
Calendar.CurrentEra)
***************
*** 243,247 ****
public long ToFileTime()
{
! long time = value__ - FileTimeBase.Ticks;
if(time < 0)
{
--- 243,247 ----
public long ToFileTime()
{
! long time = value_ - FileTimeBase.Ticks;
if(time < 0)
{
***************
*** 285,289 ****
public double ToOADate()
{
! if(value__ == 0)
{
// Special case for uninitialized
DateTime values.
--- 285,289 ----
public double ToOADate()
{
! if(value_ == 0)
{
// Special case for uninitialized
DateTime values.
***************
*** 292,296 ****
else
{
! return (((double)value__) /
((double)TimeSpan.TicksPerDay))
-
((double)OLEBaseTime.Ticks);
}
--- 292,296 ----
else
{
! return (((double)value_) /
((double)TimeSpan.TicksPerDay))
-
((double)OLEBaseTime.Ticks);
}
***************
*** 304,308 ****
unchecked
{
! return (int)(value__ ^ (value__ >> 32));
}
}
--- 304,308 ----
unchecked
{
! return (int)(value_ ^ (value_ >> 32));
}
}
***************
*** 313,317 ****
if(value is DateTime)
{
! return (value__ ==
((DateTime)value).value__);
}
else
--- 313,317 ----
if(value is DateTime)
{
! return (value_ ==
((DateTime)value).value_);
}
else
***************
*** 322,326 ****
public static bool Equals(DateTime d1, DateTime d2)
{
! return (d1.value__ == d2.value__);
}
--- 322,326 ----
public static bool Equals(DateTime d1, DateTime d2)
{
! return (d1.value_ == d2.value_);
}
***************
*** 391,399 ****
public static int Compare(DateTime t1, DateTime t2)
{
! if(t1.value__ < t2.value__)
{
return -1;
}
! else if(t1.value__ > t2.value__)
{
return 1;
--- 391,399 ----
public static int Compare(DateTime t1, DateTime t2)
{
! if(t1.value_ < t2.value_)
{
return -1;
}
! else if(t1.value_ > t2.value_)
{
return 1;
***************
*** 414,423 ****
throw new
ArgumentException(_("Arg_MustBeDateTime"));
}
! long value2 = ((DateTime)value).value__;
! if(value__ < value2)
{
return -1;
}
! else if(value__ > value2)
{
return 1;
--- 414,423 ----
throw new
ArgumentException(_("Arg_MustBeDateTime"));
}
! long value2 = ((DateTime)value).value_;
! if(value_ < value2)
{
return -1;
}
! else if(value_ > value2)
{
return 1;
***************
*** 544,548 ****
get
{
! return new DateTime(value__ - (value__
% ticksPerDay));
}
}
--- 544,548 ----
get
{
! return new DateTime(value_ - (value_ %
ticksPerDay));
}
}
***************
*** 555,559 ****
// Get the tick offset within the year
for the day.
! long ticks = value__ -
YearToTicks(year);
// Convert the tick offset into days.
--- 555,559 ----
// Get the tick offset within the year
for the day.
! long ticks = value_ - YearToTicks(year);
// Convert the tick offset into days.
***************
*** 591,595 ****
// Get the tick offset within the year
for the day.
! long ticks = value__ -
YearToTicks(year);
// Convert the tick offset into days.
--- 591,595 ----
// Get the tick offset within the year
for the day.
! long ticks = value_ - YearToTicks(year);
// Convert the tick offset into days.
***************
*** 628,632 ****
// Convert the tick count into a day
value.
! int days = unchecked((int)(value__ /
TimeSpan.TicksPerDay));
// Determine the 400-year cycle that
contains the date.
--- 628,632 ----
// Convert the tick count into a day
value.
! int days = unchecked((int)(value_ /
TimeSpan.TicksPerDay));
// Determine the 400-year cycle that
contains the date.
***************
*** 686,690 ****
unchecked
{
! return (int)((value__ /
(ticksPerDay / 24)) % 24);
}
}
--- 686,690 ----
unchecked
{
! return (int)((value_ /
(ticksPerDay / 24)) % 24);
}
}
***************
*** 696,700 ****
unchecked
{
! return (int)((value__ /
(ticksPerDay / (24 * 60))) % 60);
}
}
--- 696,700 ----
unchecked
{
! return (int)((value_ /
(ticksPerDay / (24 * 60))) % 60);
}
}
***************
*** 706,710 ****
unchecked
{
! return (int)((value__ /
10000000L) % 60);
}
}
--- 706,710 ----
unchecked
{
! return (int)((value_ /
10000000L) % 60);
}
}
***************
*** 716,720 ****
unchecked
{
! return (int)((value__ / 10000L)
% 1000L);
}
}
--- 716,720 ----
unchecked
{
! return (int)((value_ / 10000L)
% 1000L);
}
}
***************
*** 726,730 ****
unchecked
{
! return (int)(((value__ /
ticksPerDay) + 1) % 7);
}
}
--- 726,730 ----
unchecked
{
! return (int)(((value_ /
ticksPerDay) + 1) % 7);
}
}
***************
*** 735,739 ****
{
// Get the tick offset within the year
for the day.
! long ticks = value__ -
YearToTicks(Year);
// Convert the tick offset into days.
--- 735,739 ----
{
// Get the tick offset within the year
for the day.
! long ticks = value_ - YearToTicks(Year);
// Convert the tick offset into days.
***************
*** 745,749 ****
get
{
! return value__;
}
}
--- 745,749 ----
get
{
! return value_;
}
}
***************
*** 752,756 ****
get
{
! return new TimeSpan(value__ %
TimeSpan.TicksPerDay);
}
}
--- 752,756 ----
get
{
! return new TimeSpan(value_ %
TimeSpan.TicksPerDay);
}
}
***************
*** 780,808 ****
// Operators.
public static bool operator==(DateTime d1, DateTime d2)
! { return (d1.value__ == d2.value__); }
public static bool operator!=(DateTime d1, DateTime d2)
! { return (d1.value__ != d2.value__); }
public static bool operator<(DateTime d1, DateTime d2)
! { return (d1.value__ < d2.value__); }
public static bool operator>(DateTime d1, DateTime d2)
! { return (d1.value__ > d2.value__); }
public static bool operator<=(DateTime d1, DateTime d2)
! { return (d1.value__ <= d2.value__); }
public static bool operator>=(DateTime d1, DateTime d2)
! { return (d1.value__ >= d2.value__); }
public static DateTime operator+(DateTime d, TimeSpan t)
! { return new DateTime(d.value__ + t.value__); }
public static DateTime operator-(DateTime d, TimeSpan t)
! { return new DateTime(d.value__ - t.value__); }
public static TimeSpan operator-(DateTime d1, DateTime d2)
! { return new TimeSpan(d1.value__ - d2.value__); }
// Named operators.
public DateTime Add(TimeSpan t)
! { return new DateTime(value__ + t.value__); }
public DateTime Subtract(TimeSpan t)
! { return new DateTime(value__ - t.value__); }
public TimeSpan Subtract(DateTime d)
! { return new TimeSpan(value__ - d.value__); }
// Internal version of the "Add*" methods.
--- 780,808 ----
// Operators.
public static bool operator==(DateTime d1, DateTime d2)
! { return (d1.value_ == d2.value_); }
public static bool operator!=(DateTime d1, DateTime d2)
! { return (d1.value_ != d2.value_); }
public static bool operator<(DateTime d1, DateTime d2)
! { return (d1.value_ < d2.value_); }
public static bool operator>(DateTime d1, DateTime d2)
! { return (d1.value_ > d2.value_); }
public static bool operator<=(DateTime d1, DateTime d2)
! { return (d1.value_ <= d2.value_); }
public static bool operator>=(DateTime d1, DateTime d2)
! { return (d1.value_ >= d2.value_); }
public static DateTime operator+(DateTime d, TimeSpan t)
! { return new DateTime(d.value_ + t.value_); }
public static DateTime operator-(DateTime d, TimeSpan t)
! { return new DateTime(d.value_ - t.value_); }
public static TimeSpan operator-(DateTime d1, DateTime d2)
! { return new TimeSpan(d1.value_ - d2.value_); }
// Named operators.
public DateTime Add(TimeSpan t)
! { return new DateTime(value_ + t.value_); }
public DateTime Subtract(TimeSpan t)
! { return new DateTime(value_ - t.value_); }
public TimeSpan Subtract(DateTime d)
! { return new TimeSpan(value_ - d.value_); }
// Internal version of the "Add*" methods.
***************
*** 816,820 ****
{
return new DateTime
! (value__ +
((long)(value * (double)multiplier)));
}
catch(OverflowException)
--- 816,820 ----
{
return new DateTime
! (value_ + ((long)(value
* (double)multiplier)));
}
catch(OverflowException)
***************
*** 848,852 ****
int month = Month;
int day = Day;
! long ticks = (value__ % TimeSpan.TicksPerDay);
int hour = (int)(ticks / TimeSpan.TicksPerHour);
int minute = (int)((ticks /
TimeSpan.TicksPerMinute) % 60);
--- 848,852 ----
int month = Month;
int day = Day;
! long ticks = (value_ % TimeSpan.TicksPerDay);
int hour = (int)(ticks / TimeSpan.TicksPerHour);
int minute = (int)((ticks /
TimeSpan.TicksPerMinute) % 60);
***************
*** 885,889 ****
public DateTime AddTicks(long value)
{
! return new DateTime(value__ + value);
}
public DateTime AddYears(int years)
--- 885,889 ----
public DateTime AddTicks(long value)
{
! return new DateTime(value_ + value);
}
public DateTime AddYears(int years)
***************
*** 893,897 ****
int month = Month;
int day = Day;
! long ticks = (value__ % TimeSpan.TicksPerDay);
int hour = (int)(ticks / TimeSpan.TicksPerHour);
int minute = (int)((ticks /
TimeSpan.TicksPerMinute) % 60);
--- 893,897 ----
int month = Month;
int day = Day;
! long ticks = (value_ % TimeSpan.TicksPerDay);
int hour = (int)(ticks / TimeSpan.TicksPerHour);
int minute = (int)((ticks /
TimeSpan.TicksPerMinute) % 60);
***************
*** 934,938 ****
{
return new DateTime
! (value__ -
((long)(TimeMethods.GetTimeZoneAdjust())) *
TimeSpan.TicksPerSecond);
}
--- 934,938 ----
{
return new DateTime
! (value_ -
((long)(TimeMethods.GetTimeZoneAdjust())) *
TimeSpan.TicksPerSecond);
}
***************
*** 942,946 ****
{
return new DateTime
! (value__ +
((long)(TimeMethods.GetTimeZoneAdjust())) *
TimeSpan.TicksPerSecond);
}
--- 942,946 ----
{
return new DateTime
! (value_ +
((long)(TimeMethods.GetTimeZoneAdjust())) *
TimeSpan.TicksPerSecond);
}
Index: Double.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Double.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Double.cs 20 Apr 2002 00:50:56 -0000 1.7
--- Double.cs 26 Nov 2002 04:00:35 -0000 1.8
***************
*** 31,35 ****
#endif
{
! private double value__;
#if __CSCC__
--- 31,35 ----
#endif
{
! private double value_;
#if __CSCC__
***************
*** 49,59 ****
public override int GetHashCode()
{
! if(value__ >= 0.0)
{
! return unchecked((int)value__);
}
else
{
! return unchecked(-(int)value__);
}
}
--- 49,59 ----
public override int GetHashCode()
{
! if(value_ >= 0.0)
{
! return unchecked((int)value_);
}
else
{
! return unchecked(-(int)value_);
}
}
***************
*** 62,66 ****
if(value is Double)
{
! return (value__ ==
((Double)value).value__);
}
else
--- 62,66 ----
if(value is Double)
{
! return (value_ ==
((Double)value).value_);
}
else
***************
*** 106,110 ****
{
return NumberFormatter.FormatDouble
! (value__, format,
NumberFormatInfo.GetInstance(provider));
}
--- 106,110 ----
{
return NumberFormatter.FormatDouble
! (value_, format,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 159,164 ****
if(value is Double)
{
! double val1 = value__;
! double val2 =
((Double)value).value__;
if(val1 < val2)
{
--- 159,164 ----
if(value is Double)
{
! double val1 = value_;
! double val2 =
((Double)value).value_;
if(val1 < val2)
{
***************
*** 209,229 ****
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value__);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value__);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value__);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value__);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value__);
}
char IConvertible.ToChar(IFormatProvider provider)
--- 209,229 ----
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value_);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value_);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value_);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value_);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value_);
}
char IConvertible.ToChar(IFormatProvider provider)
***************
*** 235,263 ****
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value__);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value__);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value__);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value__);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value__);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return value__;
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value__);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
--- 235,263 ----
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value_);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value_);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value_);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value_);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value_);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return value_;
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value_);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
Index: Int16.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Int16.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Int16.cs 5 Oct 2002 06:53:57 -0000 1.8
--- Int16.cs 26 Nov 2002 04:00:35 -0000 1.9
***************
*** 30,34 ****
#endif
{
! private short value__;
public const short MaxValue = 32767;
--- 30,34 ----
#endif
{
! private short value_;
public const short MaxValue = 32767;
***************
*** 38,43 ****
public override int GetHashCode()
{
! return unchecked((((int)(ushort)value__) |
!
(((int)(ushort)value__) << 16))
& 0x7FFFFFFF);
}
--- 38,43 ----
public override int GetHashCode()
{
! return unchecked((((int)(ushort)value_) |
!
(((int)(ushort)value_) << 16))
& 0x7FFFFFFF);
}
***************
*** 46,50 ****
if(value is Int16)
{
! return (value__ ==
((Int16)value).value__);
}
else
--- 46,50 ----
if(value is Int16)
{
! return (value_ ==
((Int16)value).value_);
}
else
***************
*** 71,78 ****
unchecked
{
! if(value__ >= 0)
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)value__, 0, 0, false, format,
NumberFormatInfo.GetInstance(provider));
}
--- 71,78 ----
unchecked
{
! if(value_ >= 0)
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)value_, 0, 0, false, format,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 80,84 ****
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)(uint)(-value__), 0, 0,
true,
format,
NumberFormatInfo.GetInstance(provider));
--- 80,84 ----
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)(uint)(-value_), 0, 0,
true,
format,
NumberFormatInfo.GetInstance(provider));
***************
*** 117,121 ****
throw new
ArgumentException(_("Arg_MustBeInt16"));
}
! return ((int)value__) -
((int)((Int16)value).value__);
}
else
--- 117,121 ----
throw new
ArgumentException(_("Arg_MustBeInt16"));
}
! return ((int)value_) -
((int)((Int16)value).value_);
}
else
***************
*** 134,186 ****
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value__);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value__);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value__);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return value__;
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value__);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value__);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value__);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value__);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value__);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value__);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value__);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value__);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value__);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
--- 134,186 ----
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value_);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value_);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value_);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return value_;
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value_);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value_);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value_);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value_);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value_);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value_);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value_);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value_);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value_);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
Index: Int32.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Int32.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Int32.cs 5 Oct 2002 06:53:57 -0000 1.8
--- Int32.cs 26 Nov 2002 04:00:35 -0000 1.9
***************
*** 30,34 ****
#endif
{
! private int value__;
public const int MaxValue = 0x7FFFFFFF;
--- 30,34 ----
#endif
{
! private int value_;
public const int MaxValue = 0x7FFFFFFF;
***************
*** 37,46 ****
// Override inherited methods.
public override int GetHashCode()
! { return (value__ & 0x7FFFFFFF); }
public override bool Equals(Object value)
{
if(value is Int32)
{
! return (value__ ==
((Int32)value).value__);
}
else
--- 37,46 ----
// Override inherited methods.
public override int GetHashCode()
! { return (value_ & 0x7FFFFFFF); }
public override bool Equals(Object value)
{
if(value is Int32)
{
! return (value_ ==
((Int32)value).value_);
}
else
***************
*** 67,74 ****
unchecked
{
! if(value__ >= 0)
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)value__, 0, 0, false, format,
NumberFormatInfo.GetInstance(provider));
}
--- 67,74 ----
unchecked
{
! if(value_ >= 0)
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)value_, 0, 0, false, format,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 76,80 ****
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)(uint)(-value__), 0, 0,
true,
format,
NumberFormatInfo.GetInstance(provider));
--- 76,80 ----
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)(uint)(-value_), 0, 0,
true,
format,
NumberFormatInfo.GetInstance(provider));
***************
*** 113,122 ****
throw new
ArgumentException(_("Arg_MustBeInt32"));
}
! int temp = ((Int32)value).value__;
! if(value__ < temp)
{
return -1;
}
! else if(value__ > temp)
{
return 1;
--- 113,122 ----
throw new
ArgumentException(_("Arg_MustBeInt32"));
}
! int temp = ((Int32)value).value_;
! if(value_ < temp)
{
return -1;
}
! else if(value_ > temp)
{
return 1;
***************
*** 142,194 ****
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value__);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value__);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value__);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value__);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value__);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value__);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return value__;
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value__);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value__);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value__);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value__);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value__);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value__);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
--- 142,194 ----
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value_);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value_);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value_);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value_);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value_);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value_);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return value_;
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value_);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value_);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value_);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value_);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value_);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value_);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
Index: Int64.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Int64.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Int64.cs 5 Oct 2002 06:53:57 -0000 1.7
--- Int64.cs 26 Nov 2002 04:00:35 -0000 1.8
***************
*** 30,34 ****
#endif
{
! private long value__;
public const long MaxValue = 0x7FFFFFFFFFFFFFFF;
--- 30,34 ----
#endif
{
! private long value_;
public const long MaxValue = 0x7FFFFFFFFFFFFFFF;
***************
*** 38,42 ****
public override int GetHashCode()
{
! return unchecked(((int)(value__ ^ (value__ >>
32)))
& 0x7FFFFFFF);
}
--- 38,42 ----
public override int GetHashCode()
{
! return unchecked(((int)(value_ ^ (value_ >>
32)))
& 0x7FFFFFFF);
}
***************
*** 45,49 ****
if(value is Int64)
{
! return (value__ ==
((Int64)value).value__);
}
else
--- 45,49 ----
if(value is Int64)
{
! return (value_ ==
((Int64)value).value_);
}
else
***************
*** 70,77 ****
unchecked
{
! if(value__ >= 0)
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)value__, 0, 0, false, format,
NumberFormatInfo.GetInstance(provider));
}
--- 70,77 ----
unchecked
{
! if(value_ >= 0)
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)value_, 0, 0, false, format,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 79,83 ****
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)(-value__), 0, 0, true, format,
NumberFormatInfo.GetInstance(provider));
}
--- 79,83 ----
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)(-value_), 0, 0, true, format,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 115,124 ****
throw new
ArgumentException(_("Arg_MustBeInt64"));
}
! long value2 = ((Int64)value).value__;
! if(value__ < value2)
{
return -1;
}
! else if(value__ > value2)
{
return 1;
--- 115,124 ----
throw new
ArgumentException(_("Arg_MustBeInt64"));
}
! long value2 = ((Int64)value).value_;
! if(value_ < value2)
{
return -1;
}
! else if(value_ > value2)
{
return 1;
***************
*** 144,196 ****
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value__);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value__);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value__);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value__);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value__);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value__);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value__);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value__);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return value__;
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value__);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value__);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value__);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value__);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
--- 144,196 ----
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value_);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value_);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value_);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value_);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value_);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value_);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value_);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value_);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return value_;
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value_);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value_);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value_);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value_);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
Index: IntPtr.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/IntPtr.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** IntPtr.cs 2 Dec 2001 22:00:06 -0000 1.6
--- IntPtr.cs 26 Nov 2002 04:00:35 -0000 1.7
***************
*** 31,40 ****
// Internal state.
! unsafe private void *value__;
// Constructors.
unsafe public IntPtr(int value)
{
! value__ = (void *)value;
}
unsafe public IntPtr(long value)
--- 31,40 ----
// Internal state.
! unsafe private void *value_;
// Constructors.
unsafe public IntPtr(int value)
{
! value_ = (void *)value;
}
unsafe public IntPtr(long value)
***************
*** 46,50 ****
throw new
OverflowException(_("Overflow_Pointer"));
}
! value__ = (void *)value;
}
#if !ECMA_COMPAT
--- 46,50 ----
throw new
OverflowException(_("Overflow_Pointer"));
}
! value_ = (void *)value;
}
#if !ECMA_COMPAT
***************
*** 52,56 ****
unsafe public IntPtr(void *value)
{
! value__ = value;
}
#endif
--- 52,56 ----
unsafe public IntPtr(void *value)
{
! value_ = value;
}
#endif
***************
*** 59,63 ****
unsafe public override int GetHashCode()
{
! return unchecked((int)value__);
}
unsafe public override bool Equals(Object value)
--- 59,63 ----
unsafe public override int GetHashCode()
{
! return unchecked((int)value_);
}
unsafe public override bool Equals(Object value)
***************
*** 65,69 ****
if(value is IntPtr)
{
! return (value__ ==
((IntPtr)value).value__);
}
else
--- 65,69 ----
if(value is IntPtr)
{
! return (value_ ==
((IntPtr)value).value_);
}
else
***************
*** 76,80 ****
unsafe public int ToInt32()
{
! long ptr = (long)value__;
if(ptr >= (long)(Int32.MinValue) &&
ptr <= (long)(Int32.MaxValue))
--- 76,80 ----
unsafe public int ToInt32()
{
! long ptr = (long)value_;
if(ptr >= (long)(Int32.MinValue) &&
ptr <= (long)(Int32.MaxValue))
***************
*** 89,93 ****
unsafe public long ToInt64()
{
! return (long)value__;
}
--- 89,93 ----
unsafe public long ToInt64()
{
! return (long)value_;
}
***************
*** 96,100 ****
unsafe public void *ToPointer()
{
! return value__;
}
--- 96,100 ----
unsafe public void *ToPointer()
{
! return value_;
}
***************
*** 104,112 ****
if(Size == 4)
{
! return ((int)value__).ToString();
}
else
{
! return ((long)value__).ToString();
}
}
--- 104,112 ----
if(Size == 4)
{
! return ((int)value_).ToString();
}
else
{
! return ((long)value_).ToString();
}
}
***************
*** 127,135 ****
unsafe public static bool operator==(IntPtr x, IntPtr y)
{
! return (x.value__ == y.value__);
}
unsafe public static bool operator!=(IntPtr x, IntPtr y)
{
! return (x.value__ != y.value__);
}
--- 127,135 ----
unsafe public static bool operator==(IntPtr x, IntPtr y)
{
! return (x.value_ == y.value_);
}
unsafe public static bool operator!=(IntPtr x, IntPtr y)
{
! return (x.value_ != y.value_);
}
Index: RuntimeArgumentHandle.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/RuntimeArgumentHandle.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** RuntimeArgumentHandle.cs 3 Dec 2001 02:49:57 -0000 1.2
--- RuntimeArgumentHandle.cs 26 Nov 2002 04:00:35 -0000 1.3
***************
*** 28,37 ****
// Internal state.
! private IntPtr value__;
// Internal constructor.
internal RuntimeArgumentHandle(IntPtr value)
{
! value__ = value;
}
--- 28,37 ----
// Internal state.
! private IntPtr value_;
// Internal constructor.
internal RuntimeArgumentHandle(IntPtr value)
{
! value_ = value;
}
Index: RuntimeFieldHandle.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/RuntimeFieldHandle.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** RuntimeFieldHandle.cs 2 Dec 2001 09:29:50 -0000 1.3
--- RuntimeFieldHandle.cs 26 Nov 2002 04:00:36 -0000 1.4
***************
*** 26,35 ****
{
// Internal state.
! private IntPtr value__;
// Internal constructor.
internal RuntimeFieldHandle(IntPtr value)
{
! value__ = value;
}
--- 26,35 ----
{
// Internal state.
! private IntPtr value_;
// Internal constructor.
internal RuntimeFieldHandle(IntPtr value)
{
! value_ = value;
}
***************
*** 39,43 ****
get
{
! return value__;
}
}
--- 39,43 ----
get
{
! return value_;
}
}
Index: RuntimeMethodHandle.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/RuntimeMethodHandle.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** RuntimeMethodHandle.cs 1 Apr 2002 05:31:06 -0000 1.5
--- RuntimeMethodHandle.cs 26 Nov 2002 04:00:36 -0000 1.6
***************
*** 28,37 ****
{
// Internal state.
! private IntPtr value__;
// Internal constructor.
internal RuntimeMethodHandle(IntPtr value)
{
! value__ = value;
}
--- 28,37 ----
{
// Internal state.
! private IntPtr value_;
// Internal constructor.
internal RuntimeMethodHandle(IntPtr value)
{
! value_ = value;
}
***************
*** 47,51 ****
get
{
! return value__;
}
}
--- 47,51 ----
get
{
! return value_;
}
}
Index: RuntimeTypeHandle.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/RuntimeTypeHandle.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** RuntimeTypeHandle.cs 29 Nov 2001 00:36:34 -0000 1.3
--- RuntimeTypeHandle.cs 26 Nov 2002 04:00:36 -0000 1.4
***************
*** 25,34 ****
{
// Internal state.
! private IntPtr value__;
// Constructor.
internal RuntimeTypeHandle(IntPtr value)
{
! value__ = value;
}
--- 25,34 ----
{
// Internal state.
! private IntPtr value_;
// Constructor.
internal RuntimeTypeHandle(IntPtr value)
{
! value_ = value;
}
***************
*** 38,42 ****
get
{
! return value__;
}
}
--- 38,42 ----
get
{
! return value_;
}
}
Index: SByte.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/SByte.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** SByte.cs 5 Oct 2002 06:53:57 -0000 1.8
--- SByte.cs 26 Nov 2002 04:00:36 -0000 1.9
***************
*** 31,35 ****
#endif
{
! private sbyte value__;
public const sbyte MaxValue = 127;
--- 31,35 ----
#endif
{
! private sbyte value_;
public const sbyte MaxValue = 127;
***************
*** 39,43 ****
public override int GetHashCode()
{
! return unchecked((((int)value__) ^
(((int)value__) << 8)));
}
public override bool Equals(Object value)
--- 39,43 ----
public override int GetHashCode()
{
! return unchecked((((int)value_) ^
(((int)value_) << 8)));
}
public override bool Equals(Object value)
***************
*** 45,49 ****
if(value is SByte)
{
! return (value__ ==
((SByte)value).value__);
}
else
--- 45,49 ----
if(value is SByte)
{
! return (value_ ==
((SByte)value).value_);
}
else
***************
*** 70,77 ****
unchecked
{
! if(value__ >= 0)
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)value__, 0, 0, false, format,
NumberFormatInfo.GetInstance(provider));
}
--- 70,77 ----
unchecked
{
! if(value_ >= 0)
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)value_, 0, 0, false, format,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 79,83 ****
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)(uint)(-value__), 0, 0,
true,
format,
NumberFormatInfo.GetInstance(provider));
--- 79,83 ----
{
return
NumberFormatter.FormatFixedPoint
!
((ulong)(uint)(-value_), 0, 0,
true,
format,
NumberFormatInfo.GetInstance(provider));
***************
*** 120,124 ****
throw new
ArgumentException(_("Arg_MustBeSByte"));
}
! return ((int)value__) -
((int)((SByte)value).value__);
}
else
--- 120,124 ----
throw new
ArgumentException(_("Arg_MustBeSByte"));
}
! return ((int)value_) -
((int)((SByte)value).value_);
}
else
***************
*** 137,189 ****
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value__);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value__);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return value__;
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value__);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value__);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value__);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value__);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value__);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value__);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value__);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value__);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value__);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value__);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
--- 137,189 ----
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value_);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value_);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return value_;
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value_);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value_);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value_);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value_);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value_);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value_);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value_);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value_);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value_);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value_);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
Index: Single.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Single.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Single.cs 20 Apr 2002 00:50:56 -0000 1.7
--- Single.cs 26 Nov 2002 04:00:36 -0000 1.8
***************
*** 31,35 ****
#endif
{
! private float value__;
#if __CSCC__
--- 31,35 ----
#endif
{
! private float value_;
#if __CSCC__
***************
*** 49,59 ****
public override int GetHashCode()
{
! if(value__ >= 0.0)
{
! return unchecked((int)value__);
}
else
{
! return unchecked(-(int)value__);
}
}
--- 49,59 ----
public override int GetHashCode()
{
! if(value_ >= 0.0)
{
! return unchecked((int)value_);
}
else
{
! return unchecked(-(int)value_);
}
}
***************
*** 62,66 ****
if(value is Single)
{
! return (value__ ==
((Single)value).value__);
}
else
--- 62,66 ----
if(value is Single)
{
! return (value_ ==
((Single)value).value_);
}
else
***************
*** 86,90 ****
{
return NumberFormatter.FormatSingle
! (value__, format,
NumberFormatInfo.GetInstance(provider));
}
--- 86,90 ----
{
return NumberFormatter.FormatSingle
! (value_, format,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 159,164 ****
if(value is Single)
{
! float val1 = value__;
! float val2 =
((Single)value).value__;
if(val1 < val2)
{
--- 159,164 ----
if(value is Single)
{
! float val1 = value_;
! float val2 =
((Single)value).value_;
if(val1 < val2)
{
***************
*** 209,229 ****
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value__);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value__);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value__);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value__);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value__);
}
char IConvertible.ToChar(IFormatProvider provider)
--- 209,229 ----
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value_);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value_);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value_);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value_);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value_);
}
char IConvertible.ToChar(IFormatProvider provider)
***************
*** 235,263 ****
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value__);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value__);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value__);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value__);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return value__;
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value__);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value__);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
--- 235,263 ----
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value_);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value_);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value_);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value_);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return value_;
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value_);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value_);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
Index: TimeSpan.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/TimeSpan.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** TimeSpan.cs 22 Mar 2002 00:15:46 -0000 1.6
--- TimeSpan.cs 26 Nov 2002 04:00:36 -0000 1.7
***************
*** 24,28 ****
public struct TimeSpan : IComparable
{
! internal long value__;
// Public constants.
--- 24,28 ----
public struct TimeSpan : IComparable
{
! internal long value_;
// Public constants.
***************
*** 41,45 ****
public TimeSpan(long ticks)
{
! value__ = ticks;
}
public TimeSpan(int hours, int minutes, int seconds)
--- 41,45 ----
public TimeSpan(long ticks)
{
! value_ = ticks;
}
public TimeSpan(int hours, int minutes, int seconds)
***************
*** 58,62 ****
((Decimal)seconds) *
((Decimal)TicksPerSecond) +
((Decimal)milliseconds) * 10000.0m;
! value__ = Decimal.ToInt64(result);
}
catch(OverflowException)
--- 58,62 ----
((Decimal)seconds) *
((Decimal)TicksPerSecond) +
((Decimal)milliseconds) * 10000.0m;
! value_ = Decimal.ToInt64(result);
}
catch(OverflowException)
***************
*** 76,85 ****
throw new
ArgumentException(_("Arg_MustBeTimeSpan"));
}
! long value2 = ((TimeSpan)value).value__;
! if(value__ < value2)
{
return -1;
}
! else if(value__ > value2)
{
return 1;
--- 76,85 ----
throw new
ArgumentException(_("Arg_MustBeTimeSpan"));
}
! long value2 = ((TimeSpan)value).value_;
! if(value_ < value2)
{
return -1;
}
! else if(value_ > value2)
{
return 1;
***************
*** 112,116 ****
int minutes = Minutes;
int seconds = Seconds;
! int fractional = unchecked((int)(value__ %
TicksPerSecond));
String result;
if(days != 0)
--- 112,116 ----
int minutes = Minutes;
int seconds = Seconds;
! int fractional = unchecked((int)(value_ %
TicksPerSecond));
String result;
if(days != 0)
***************
*** 145,149 ****
checked
{
! return new TimeSpan(value__ +
ts.value__);
}
}
--- 145,149 ----
checked
{
! return new TimeSpan(value_ + ts.value_);
}
}
***************
*** 152,160 ****
public static int Compare(TimeSpan t1, TimeSpan t2)
{
! if(t1.value__ < t2.value__)
{
return -1;
}
! else if(t1.value__ > t2.value__)
{
return 1;
--- 152,160 ----
public static int Compare(TimeSpan t1, TimeSpan t2)
{
! if(t1.value_ < t2.value_)
{
return -1;
}
! else if(t1.value_ > t2.value_)
{
return 1;
***************
*** 169,173 ****
public TimeSpan Duration()
{
! return new TimeSpan(Math.Abs(value__));
}
--- 169,173 ----
public TimeSpan Duration()
{
! return new TimeSpan(Math.Abs(value_));
}
***************
*** 177,181 ****
if(value is TimeSpan)
{
! return (value__ ==
((TimeSpan)value).value__);
}
else
--- 177,181 ----
if(value is TimeSpan)
{
! return (value_ ==
((TimeSpan)value).value_);
}
else
***************
*** 188,192 ****
public static bool Equals(TimeSpan t1, TimeSpan t2)
{
! return (t1.value__ == t2.value__);
}
--- 188,192 ----
public static bool Equals(TimeSpan t1, TimeSpan t2)
{
! return (t1.value_ == t2.value_);
}
***************
*** 308,312 ****
public override int GetHashCode()
{
! return unchecked((int)(value__ ^ (value__ >>
16)));
}
--- 308,312 ----
public override int GetHashCode()
{
! return unchecked((int)(value_ ^ (value_ >>
16)));
}
***************
*** 314,320 ****
public TimeSpan Negate()
{
! if(value__ != Int64.MinValue)
{
! return new
TimeSpan(unchecked(-value__));
}
else
--- 314,320 ----
public TimeSpan Negate()
{
! if(value_ != Int64.MinValue)
{
! return new TimeSpan(unchecked(-value_));
}
else
***************
*** 416,420 ****
checked
{
! return new TimeSpan(value__ -
ts.value__);
}
}
--- 416,420 ----
checked
{
! return new TimeSpan(value_ - ts.value_);
}
}
***************
*** 439,463 ****
public static bool operator==(TimeSpan t1, TimeSpan t2)
{
! return (t1.value__ == t2.value__);
}
public static bool operator!=(TimeSpan t1, TimeSpan t2)
{
! return (t1.value__ != t2.value__);
}
public static bool operator>(TimeSpan t1, TimeSpan t2)
{
! return (t1.value__ > t2.value__);
}
public static bool operator>=(TimeSpan t1, TimeSpan t2)
{
! return (t1.value__ >= t2.value__);
}
public static bool operator<(TimeSpan t1, TimeSpan t2)
{
! return (t1.value__ < t2.value__);
}
public static bool operator<=(TimeSpan t1, TimeSpan t2)
{
! return (t1.value__ <= t2.value__);
}
--- 439,463 ----
public static bool operator==(TimeSpan t1, TimeSpan t2)
{
! return (t1.value_ == t2.value_);
}
public static bool operator!=(TimeSpan t1, TimeSpan t2)
{
! return (t1.value_ != t2.value_);
}
public static bool operator>(TimeSpan t1, TimeSpan t2)
{
! return (t1.value_ > t2.value_);
}
public static bool operator>=(TimeSpan t1, TimeSpan t2)
{
! return (t1.value_ >= t2.value_);
}
public static bool operator<(TimeSpan t1, TimeSpan t2)
{
! return (t1.value_ < t2.value_);
}
public static bool operator<=(TimeSpan t1, TimeSpan t2)
{
! return (t1.value_ <= t2.value_);
}
***************
*** 467,471 ****
get
{
! return unchecked((int)(value__ /
TicksPerDay));
}
}
--- 467,471 ----
get
{
! return unchecked((int)(value_ /
TicksPerDay));
}
}
***************
*** 474,478 ****
get
{
! return unchecked((int)((value__ /
TicksPerHour) % 24));
}
}
--- 474,478 ----
get
{
! return unchecked((int)((value_ /
TicksPerHour) % 24));
}
}
***************
*** 481,485 ****
get
{
! return unchecked((int)((value__ /
TicksPerMinute) % 60));
}
}
--- 481,485 ----
get
{
! return unchecked((int)((value_ /
TicksPerMinute) % 60));
}
}
***************
*** 488,492 ****
get
{
! return unchecked((int)((value__ /
TicksPerSecond) % 60));
}
}
--- 488,492 ----
get
{
! return unchecked((int)((value_ /
TicksPerSecond) % 60));
}
}
***************
*** 496,500 ****
{
return unchecked
! ((int)((value__ /
TicksPerMillisecond) % 1000));
}
}
--- 496,500 ----
{
return unchecked
! ((int)((value_ /
TicksPerMillisecond) % 1000));
}
}
***************
*** 503,507 ****
get
{
! return value__;
}
}
--- 503,507 ----
get
{
! return value_;
}
}
***************
*** 510,514 ****
get
{
! return ((double)value__) /
((double)TicksPerDay);
}
}
--- 510,514 ----
get
{
! return ((double)value_) /
((double)TicksPerDay);
}
}
***************
*** 517,521 ****
get
{
! return ((double)value__) /
((double)TicksPerHour);
}
}
--- 517,521 ----
get
{
! return ((double)value_) /
((double)TicksPerHour);
}
}
***************
*** 524,528 ****
get
{
! return ((double)value__) /
((double)TicksPerMinute);
}
}
--- 524,528 ----
get
{
! return ((double)value_) /
((double)TicksPerMinute);
}
}
***************
*** 531,535 ****
get
{
! return ((double)value__) /
((double)TicksPerSecond);
}
}
--- 531,535 ----
get
{
! return ((double)value_) /
((double)TicksPerSecond);
}
}
***************
*** 538,542 ****
get
{
! double temp = ((double)value__) /
1000.0;
if(temp > 922337203685477.0)
{
--- 538,542 ----
get
{
! double temp = ((double)value_) / 1000.0;
if(temp > 922337203685477.0)
{
Index: UInt16.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/UInt16.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** UInt16.cs 5 Oct 2002 06:53:57 -0000 1.7
--- UInt16.cs 26 Nov 2002 04:00:36 -0000 1.8
***************
*** 31,35 ****
#endif
{
! private ushort value__;
public const ushort MaxValue = 65535;
--- 31,35 ----
#endif
{
! private ushort value_;
public const ushort MaxValue = 65535;
***************
*** 38,47 ****
// Override inherited methods.
public override int GetHashCode()
! { return (int)value__; }
public override bool Equals(Object value)
{
if(value is UInt16)
{
! return (value__ ==
((UInt16)value).value__);
}
else
--- 38,47 ----
// Override inherited methods.
public override int GetHashCode()
! { return (int)value_; }
public override bool Equals(Object value)
{
if(value is UInt16)
{
! return (value_ ==
((UInt16)value).value_);
}
else
***************
*** 55,59 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, null,
NumberFormatInfo.CurrentInfo);
}
--- 55,59 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, null,
NumberFormatInfo.CurrentInfo);
}
***************
*** 61,65 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, format,
NumberFormatInfo.CurrentInfo);
}
--- 61,65 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, format,
NumberFormatInfo.CurrentInfo);
}
***************
*** 67,71 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, null,
NumberFormatInfo.GetInstance(provider));
}
--- 67,71 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, null,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 73,77 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, format,
NumberFormatInfo.GetInstance(provider));
}
--- 73,77 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, format,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 111,115 ****
throw new
ArgumentException(_("Arg_MustBeUInt16"));
}
! return ((int)value__) -
((int)((UInt16)value).value__);
}
else
--- 111,115 ----
throw new
ArgumentException(_("Arg_MustBeUInt16"));
}
! return ((int)value_) -
((int)((UInt16)value).value_);
}
else
***************
*** 128,180 ****
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value__);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value__);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value__);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value__);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return value__;
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value__);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value__);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value__);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value__);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value__);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value__);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value__);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value__);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
--- 128,180 ----
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value_);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value_);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value_);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value_);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return value_;
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value_);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value_);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value_);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value_);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value_);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value_);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value_);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value_);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
Index: UInt32.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/UInt32.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** UInt32.cs 5 Oct 2002 06:53:57 -0000 1.7
--- UInt32.cs 26 Nov 2002 04:00:36 -0000 1.8
***************
*** 31,35 ****
#endif
{
! private uint value__;
public const uint MaxValue = 0xFFFFFFFF;
--- 31,35 ----
#endif
{
! private uint value_;
public const uint MaxValue = 0xFFFFFFFF;
***************
*** 39,43 ****
public override int GetHashCode()
{
! return unchecked(((int)value__) & 0x7FFFFFFF);
}
public override bool Equals(Object value)
--- 39,43 ----
public override int GetHashCode()
{
! return unchecked(((int)value_) & 0x7FFFFFFF);
}
public override bool Equals(Object value)
***************
*** 45,49 ****
if(value is UInt32)
{
! return (value__ ==
((UInt32)value).value__);
}
else
--- 45,49 ----
if(value is UInt32)
{
! return (value_ ==
((UInt32)value).value_);
}
else
***************
*** 57,61 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, null,
NumberFormatInfo.CurrentInfo);
}
--- 57,61 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, null,
NumberFormatInfo.CurrentInfo);
}
***************
*** 63,67 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, format,
NumberFormatInfo.CurrentInfo);
}
--- 63,67 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, format,
NumberFormatInfo.CurrentInfo);
}
***************
*** 69,73 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, null,
NumberFormatInfo.GetInstance(provider));
}
--- 69,73 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, null,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 75,79 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, format,
NumberFormatInfo.GetInstance(provider));
}
--- 75,79 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, format,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 113,122 ****
throw new
ArgumentException(_("Arg_MustBeUInt32"));
}
! uint value2 = ((UInt32)value).value__;
! if(value__ < value2)
{
return -1;
}
! else if(value__ > value2)
{
return 1;
--- 113,122 ----
throw new
ArgumentException(_("Arg_MustBeUInt32"));
}
! uint value2 = ((UInt32)value).value_;
! if(value_ < value2)
{
return -1;
}
! else if(value_ > value2)
{
return 1;
***************
*** 142,194 ****
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value__);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value__);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value__);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value__);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value__);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value__);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value__);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return value__;
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value__);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value__);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value__);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value__);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value__);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
--- 142,194 ----
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value_);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value_);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value_);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value_);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value_);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value_);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value_);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return value_;
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value_);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value_);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value_);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value_);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value_);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
Index: UInt64.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/UInt64.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** UInt64.cs 5 Oct 2002 06:53:57 -0000 1.7
--- UInt64.cs 26 Nov 2002 04:00:36 -0000 1.8
***************
*** 31,35 ****
#endif
{
! private ulong value__;
public const ulong MaxValue = 0xFFFFFFFFFFFFFFFF;
--- 31,35 ----
#endif
{
! private ulong value_;
public const ulong MaxValue = 0xFFFFFFFFFFFFFFFF;
***************
*** 39,43 ****
public override int GetHashCode()
{
! return unchecked(((int)(value__ ^ (value__ >>
32)))
& 0x7FFFFFFF);
}
--- 39,43 ----
public override int GetHashCode()
{
! return unchecked(((int)(value_ ^ (value_ >>
32)))
& 0x7FFFFFFF);
}
***************
*** 46,50 ****
if(value is UInt64)
{
! return (value__ ==
((UInt64)value).value__);
}
else
--- 46,50 ----
if(value is UInt64)
{
! return (value_ ==
((UInt64)value).value_);
}
else
***************
*** 58,62 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, null,
NumberFormatInfo.CurrentInfo);
}
--- 58,62 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, null,
NumberFormatInfo.CurrentInfo);
}
***************
*** 64,68 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, format,
NumberFormatInfo.CurrentInfo);
}
--- 64,68 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, format,
NumberFormatInfo.CurrentInfo);
}
***************
*** 70,74 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, null,
NumberFormatInfo.GetInstance(provider));
}
--- 70,74 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, null,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 76,80 ****
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value__, 0, 0,
false, format,
NumberFormatInfo.GetInstance(provider));
}
--- 76,80 ----
{
return NumberFormatter.FormatFixedPoint
! ((ulong)value_, 0, 0,
false, format,
NumberFormatInfo.GetInstance(provider));
}
***************
*** 115,124 ****
throw new
ArgumentException(_("Arg_MustBeUInt64"));
}
! ulong value2 = ((UInt64)value).value__;
! if(value__ < value2)
{
return -1;
}
! else if(value__ > value2)
{
return 1;
--- 115,124 ----
throw new
ArgumentException(_("Arg_MustBeUInt64"));
}
! ulong value2 = ((UInt64)value).value_;
! if(value_ < value2)
{
return -1;
}
! else if(value_ > value2)
{
return 1;
***************
*** 144,196 ****
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value__);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value__);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value__);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value__);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value__);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value__);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value__);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value__);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value__);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value__);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value__);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value__);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value__);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
--- 144,196 ----
bool IConvertible.ToBoolean(IFormatProvider provider)
{
! return Convert.ToBoolean(value_);
}
byte IConvertible.ToByte(IFormatProvider provider)
{
! return Convert.ToByte(value_);
}
sbyte IConvertible.ToSByte(IFormatProvider provider)
{
! return Convert.ToSByte(value_);
}
short IConvertible.ToInt16(IFormatProvider provider)
{
! return Convert.ToInt16(value_);
}
ushort IConvertible.ToUInt16(IFormatProvider provider)
{
! return Convert.ToUInt16(value_);
}
char IConvertible.ToChar(IFormatProvider provider)
{
! return Convert.ToChar(value_);
}
int IConvertible.ToInt32(IFormatProvider provider)
{
! return Convert.ToInt32(value_);
}
uint IConvertible.ToUInt32(IFormatProvider provider)
{
! return Convert.ToUInt32(value_);
}
long IConvertible.ToInt64(IFormatProvider provider)
{
! return Convert.ToInt64(value_);
}
ulong IConvertible.ToUInt64(IFormatProvider provider)
{
! return Convert.ToUInt64(value_);
}
float IConvertible.ToSingle(IFormatProvider provider)
{
! return Convert.ToSingle(value_);
}
double IConvertible.ToDouble(IFormatProvider provider)
{
! return Convert.ToDouble(value_);
}
Decimal IConvertible.ToDecimal(IFormatProvider provider)
{
! return Convert.ToDecimal(value_);
}
DateTime IConvertible.ToDateTime(IFormatProvider provider)
Index: UIntPtr.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/UIntPtr.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** UIntPtr.cs 7 Dec 2001 01:45:38 -0000 1.7
--- UIntPtr.cs 26 Nov 2002 04:00:36 -0000 1.8
***************
*** 32,41 ****
// Internal state.
! unsafe private void *value__;
// Constructors.
unsafe public UIntPtr(uint value)
{
! value__ = (void *)value;
}
unsafe public UIntPtr(ulong value)
--- 32,41 ----
// Internal state.
! unsafe private void *value_;
// Constructors.
unsafe public UIntPtr(uint value)
{
! value_ = (void *)value;
}
unsafe public UIntPtr(ulong value)
***************
*** 46,50 ****
throw new
OverflowException(_("Overflow_Pointer"));
}
! value__ = (void *)value;
}
#if !ECMA_COMPAT
--- 46,50 ----
throw new
OverflowException(_("Overflow_Pointer"));
}
! value_ = (void *)value;
}
#if !ECMA_COMPAT
***************
*** 52,56 ****
unsafe public UIntPtr(void *value)
{
! value__ = value;
}
#endif
--- 52,56 ----
unsafe public UIntPtr(void *value)
{
! value_ = value;
}
#endif
***************
*** 59,63 ****
unsafe public override int GetHashCode()
{
! return unchecked((int)value__);
}
unsafe public override bool Equals(Object value)
--- 59,63 ----
unsafe public override int GetHashCode()
{
! return unchecked((int)value_);
}
unsafe public override bool Equals(Object value)
***************
*** 65,69 ****
if(value is UIntPtr)
{
! return (value__ ==
((UIntPtr)value).value__);
}
else
--- 65,69 ----
if(value is UIntPtr)
{
! return (value_ ==
((UIntPtr)value).value_);
}
else
***************
*** 76,80 ****
unsafe public uint ToUInt32()
{
! ulong ptr = (ulong)value__;
if(ptr <= (ulong)(UInt32.MaxValue))
{
--- 76,80 ----
unsafe public uint ToUInt32()
{
! ulong ptr = (ulong)value_;
if(ptr <= (ulong)(UInt32.MaxValue))
{
***************
*** 88,92 ****
unsafe public ulong ToUInt64()
{
! return (ulong)value__;
}
--- 88,92 ----
unsafe public ulong ToUInt64()
{
! return (ulong)value_;
}
***************
*** 95,99 ****
unsafe public void *ToPointer()
{
! return value__;
}
--- 95,99 ----
unsafe public void *ToPointer()
{
! return value_;
}
***************
*** 103,111 ****
if(Size == 4)
{
! return ((uint)value__).ToString();
}
else
{
! return ((ulong)value__).ToString();
}
}
--- 103,111 ----
if(Size == 4)
{
! return ((uint)value_).ToString();
}
else
{
! return ((ulong)value_).ToString();
}
}
***************
*** 126,134 ****
unsafe public static bool operator==(UIntPtr x, UIntPtr y)
{
! return (x.value__ == y.value__);
}
unsafe public static bool operator!=(UIntPtr x, UIntPtr y)
{
! return (x.value__ != y.value__);
}
--- 126,134 ----
unsafe public static bool operator==(UIntPtr x, UIntPtr y)
{
! return (x.value_ == y.value_);
}
unsafe public static bool operator!=(UIntPtr x, UIntPtr y)
{
! return (x.value_ != y.value_);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnetlib/runtime/System Boolean.cs,1.6,1.7 Byte.cs,1.7,1.8 Char.cs,1.5,1.6 DateTime.cs,1.15,1.16 Double.cs,1.7,1.8 Int16.cs,1.8,1.9 Int32.cs,1.8,1.9 Int64.cs,1.7,1.8 IntPtr.cs,1.6,1.7 RuntimeArgumentHandle.cs,1.2,1.3 RuntimeFieldHandle.cs,1.3,1.4 RuntimeMethodHandle.cs,1.5,1.6 RuntimeTypeHandle.cs,1.3,1.4 SByte.cs,1.8,1.9 Single.cs,1.7,1.8 TimeSpan.cs,1.6,1.7 UInt16.cs,1.7,1.8 UInt32.cs,1.7,1.8 UInt64.cs,1.7,1.8 UIntPtr.cs,1.7,1.8,
Rhys Weatherley <address@hidden> <=