Merge branch 'master' of git@gitorious.org:freerainbowtables-applications/freerainbow...

[freerainbowtables] / Client Applications / rcracki_mt / HashSet.cpp

diff --git a/Client Applications/rcracki_mt/HashSet.cpp b/Client Applications/rcracki_mt/HashSet.cpp
index 853efca79bc49dcda36245ab62465e526d30da56..dedb2ba139253db37b333669c9aedc178acdd8dc 100644 (file)
--- a/Client Applications/rcracki_mt/HashSet.cpp
+++ b/Client Applications/rcracki_mt/HashSet.cpp
@@ -7,7 +7,7 @@
  * Copyright 2009, 2010 Daniël Niggebrugge <niggebrugge@fox-it.com>\r
  * Copyright 2009, 2010 James Nobis <frt@quelrod.net>\r
  *\r
- * This file is part of racrcki_mt.\r
+ * This file is part of rcracki_mt.\r
  *\r
  * rcracki_mt is free software: you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -23,7 +23,7 @@
  * along with rcracki_mt.  If not, see <http://www.gnu.org/licenses/>.\r
  */\r
 \r
-#ifdef _WIN32\r
+#if defined(_WIN32) && !defined(__GNUC__)\r
        #pragma warning(disable : 4786 4267 4018)\r
 #endif\r
 \r
@@ -42,7 +42,7 @@ void CHashSet::AddHash(string sHash)
        if (sHash == "aad3b435b51404ee")\r
                return;\r
 \r
-       UINT4 i;\r
+       uint32 i;\r
        for (i = 0; i < m_vHash.size(); i++)\r
        {\r
                if (m_vHash[i] == sHash)\r
@@ -72,7 +72,7 @@ string CHashSet::GetHashInfo(int i)
 \r
 bool CHashSet::AnyhashLeft()\r
 {\r
-       UINT4 i;\r
+       uint32 i;\r
        for (i = 0; i < m_vHash.size(); i++)\r
        {\r
                if (!m_vFound[i])\r
@@ -84,7 +84,7 @@ bool CHashSet::AnyhashLeft()
 \r
 bool CHashSet::AnyHashLeftWithLen(int nLen)\r
 {\r
-       UINT4 i;\r
+       uint32 i;\r
        for (i = 0; i < m_vHash.size(); i++)\r
        {\r
                if (!m_vFound[i])\r
@@ -99,7 +99,7 @@ void CHashSet::GetLeftHashWithLen(vector<string>& vHash, int nLen)
 {\r
        vHash.clear();\r
 \r
-       UINT4 i;\r
+       uint32 i;\r
        for (i = 0; i < m_vHash.size(); i++)\r
        {\r
                if (!m_vFound[i])\r
@@ -110,7 +110,7 @@ void CHashSet::GetLeftHashWithLen(vector<string>& vHash, int nLen)
 \r
 void CHashSet::AddHashInfo(string sHash, bool found, string sPlain, string sBinary)\r
 {\r
-       UINT4 i;\r
+       uint32 i;\r
        for (i = 0; i < m_vHash.size(); i++)\r
        {\r
                if (m_vHash[i] == sHash)\r
@@ -125,7 +125,7 @@ void CHashSet::AddHashInfo(string sHash, bool found, string sPlain, string sBina
 \r
 void CHashSet::SetPlain(string sHash, string sPlain, string sBinary)\r
 {\r
-       UINT4 i;\r
+       uint32 i;\r
        for (i = 0; i < m_vHash.size(); i++)\r
        {\r
                if (m_vHash[i] == sHash)\r
@@ -147,7 +147,7 @@ bool CHashSet::GetPlain(string sHash, string& sPlain, string& sBinary)
                return true;\r
        }\r
 \r
-       UINT4 i;\r
+       uint32 i;\r
        for (i = 0; i < m_vHash.size(); i++)\r
        {\r
                if (m_vHash[i] == sHash)\r
@@ -167,7 +167,7 @@ bool CHashSet::GetPlain(string sHash, string& sPlain, string& sBinary)
 int CHashSet::GetStatHashFound()\r
 {\r
        int nHashFound = 0;\r
-       UINT4 i;\r
+       uint32 i;\r
        for (i = 0; i < m_vHash.size(); i++)\r
        {\r
                if (m_vFound[i])\r