GCC warning fix
authordpage <dpage@a7884b65-44f6-0310-8a51-81a127f17b15>
Fri, 27 Feb 2009 16:39:45 +0000 (16:39 +0000)
committerdpage <dpage@a7884b65-44f6-0310-8a51-81a127f17b15>
Fri, 27 Feb 2009 16:39:45 +0000 (16:39 +0000)
git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@7626 a7884b65-44f6-0310-8a51-81a127f17b15

pgadmin/utils/misc.cpp

index a1ff682f57da98eaf25e0dd464e7376d0cc78bd1..d5313ee1364c707ebed44f089c893549afd92cfd 100644 (file)
@@ -331,16 +331,16 @@ static bool needsQuoting(wxString& value, bool forTypes)
                        valNoArray = value;
 
                if (forTypes &&
-            !valNoArray.CmpNoCase(wxT("character varying")) ||
-            !valNoArray.CmpNoCase(wxT("\"char\"")) ||
-                       !valNoArray.CmpNoCase(wxT("bit varying")) ||
-                       !valNoArray.CmpNoCase(wxT("double precision")) ||
-                       !valNoArray.CmpNoCase(wxT("timestamp without time zone")) ||
-                       !valNoArray.CmpNoCase(wxT("timestamp with time zone")) ||
-                       !valNoArray.CmpNoCase(wxT("time without time zone")) ||
-                       !valNoArray.CmpNoCase(wxT("time with time zone")) ||
-            !valNoArray.CmpNoCase(wxT("\"trigger\"")) ||
-            !valNoArray.CmpNoCase(wxT("\"unknown\"")))
+                        (!valNoArray.CmpNoCase(wxT("character varying")) ||
+                         !valNoArray.CmpNoCase(wxT("\"char\"")) ||
+                        !valNoArray.CmpNoCase(wxT("bit varying")) ||
+                        !valNoArray.CmpNoCase(wxT("double precision")) ||
+                        !valNoArray.CmpNoCase(wxT("timestamp without time zone")) ||
+                        !valNoArray.CmpNoCase(wxT("timestamp with time zone")) ||
+                        !valNoArray.CmpNoCase(wxT("time without time zone")) ||
+                        !valNoArray.CmpNoCase(wxT("time with time zone")) ||
+                         !valNoArray.CmpNoCase(wxT("\"trigger\"")) ||
+                         !valNoArray.CmpNoCase(wxT("\"unknown\""))))
                        return false;
 
         int pos = 0;
@@ -832,9 +832,9 @@ wxString GetHtmlEntity(const wxChar ch)
     // REWRITE THIS - IT'S (STILL) BLOODY INEFFICIENT!!
 
     // Quick bailout
-    if (ch >= 'a' && ch <= 'z' ||
-        ch >= 'A' && ch <= 'Z' ||
-        ch >= '0' && ch <= '9')
+    if ((ch >= 'a' && ch <= 'z') ||
+        (ch >= 'A' && ch <= 'Z') ||
+        (ch >= '0' && ch <= '9'))
         return wxString(ch);
 
     unsigned short ents[] = {