Explorar o código

2004-12-27 Alp Toker <[email protected]>

  * SqlSharpCli.cs: Math and Mono.Math clash. Refer to System.Math directly to
  unbreak the build. Another approach would be to move the using System
  statement within the namespace block. Both have caveats.

svn path=/trunk/mcs/; revision=38100
Alp Toker %!s(int64=21) %!d(string=hai) anos
pai
achega
157f528e11
Modificáronse 2 ficheiros con 9 adicións e 3 borrados
  1. 6 0
      mcs/tools/sqlsharp/ChangeLog
  2. 3 3
      mcs/tools/sqlsharp/SqlSharpCli.cs

+ 6 - 0
mcs/tools/sqlsharp/ChangeLog

@@ -1,3 +1,9 @@
+2004-12-27  Alp Toker <[email protected]>
+
+	* SqlSharpCli.cs: Math and Mono.Math clash. Refer to System.Math directly to
+	unbreak the build. Another approach would be to move the using System
+	statement within the namespace block. Both have caveats.
+
 2004-12-26  Daniel Morgan <[email protected]>
 2004-12-26  Daniel Morgan <[email protected]>
 
 
 	* SqlSharpCli.cs: change formatting style from vs.net default
 	* SqlSharpCli.cs: change formatting style from vs.net default

+ 3 - 3
mcs/tools/sqlsharp/SqlSharpCli.cs

@@ -172,7 +172,7 @@ namespace Mono.Data.SqlSharp {
 					if (hdrLen > 32)
 					if (hdrLen > 32)
 						hdrLen = 32;
 						hdrLen = 32;
 
 
-					hdrLen = Math.Max (hdrLen, columnSize);
+					hdrLen = System.Math.Max (hdrLen, columnSize);
 
 
 					line.Append (columnHeader);
 					line.Append (columnHeader);
 					if (columnHeader.Length < hdrLen) {
 					if (columnHeader.Length < hdrLen) {
@@ -267,7 +267,7 @@ namespace Mono.Data.SqlSharp {
 						if (hdrLen > 32)
 						if (hdrLen > 32)
 							hdrLen = 32;
 							hdrLen = 32;
 
 
-						columnSize = Math.Max (colhdr.Length, columnSize);
+						columnSize = System.Math.Max (colhdr.Length, columnSize);
 
 
 						dataValue = "";
 						dataValue = "";
 						dataLen = 0;
 						dataLen = 0;
@@ -293,7 +293,7 @@ namespace Mono.Data.SqlSharp {
 							if (dataValue.Equals(""))
 							if (dataValue.Equals(""))
 								dataLen = 0;
 								dataLen = 0;
 						}
 						}
-						columnSize = Math.Max (columnSize, dataLen);
+						columnSize = System.Math.Max (columnSize, dataLen);
 					
 					
 						if (dataLen < columnSize) {
 						if (dataLen < columnSize) {
 							switch (dataType) {
 							switch (dataType) {