Cleanup `size_t`: Fewer `#pragma warning` directives

 * Remove various `#pragma warning` directives that relate to
	signed/unsigned

	4018 - signed/unsigned mismatch
	4100 - unreferenced formal parameter
	4189 - local variable initialized but unreferenced
	4244 - argument conversion, loss of data
	4355 - `this` used in base member list
	4512 - assignment operator could not be generated
	4520 - non-existing error !!
	4711 - inlining notice (off by default)

 * use `size_t` as appropriate to eliminate warnings exposed above.
 * use `static_cast<int>` as appropriate

Additional, unrelated ...
 * `_AFX_NO_MFC_CONTROLS_IN_DIALOGS`was used twice for 'X64 Release'
	configuration.

diff --git a/Externals/crystaledit/editlib/ccrystaleditview.cpp b/Externals/crystaledit/editlib/ccrystaleditview.cpp
index cf0cf11..a40b7d7 100644 (file)
--- a/Externals/crystaledit/editlib/ccrystaleditview.cpp
+++ b/Externals/crystaledit/editlib/ccrystaleditview.cpp
@@ -119,7 +119,6 @@ public :
   };
 
 
-#pragma warning ( disable : 4100 )
 /////////////////////////////////////////////////////////////////////////////
 // CCrystalEditView
 
@@ -3066,4 +3065,3 @@ void CCrystalEditView::OnRButtonDown(UINT nFlags, CPoint point)
 }
 
 ////////////////////////////////////////////////////////////////////////////
-#pragma warning ( default : 4100 )

diff --git a/Externals/crystaledit/editlib/ccrystaltextview.cpp b/Externals/crystaledit/editlib/ccrystaltextview.cpp
index d7e6188..124dcfd 100644 (file)
--- a/Externals/crystaledit/editlib/ccrystaltextview.cpp
+++ b/Externals/crystaledit/editlib/ccrystaltextview.cpp
@@ -147,7 +147,6 @@ const COLORREF SAVED_REVMARK_CLR = RGB(0x00, 0xFF, 0x00);
 
 #define ICON_INDEX_WRAPLINE         15
 
-#pragma warning ( disable : 4100 )
 ////////////////////////////////////////////////////////////////////////////
 // CCrystalTextView
 
@@ -6567,4 +6566,3 @@ SetTextTypeByContent (LPCTSTR pszContent)
 }
 
 ////////////////////////////////////////////////////////////////////////////
-#pragma warning ( default : 4100 )

diff --git a/Externals/crystaledit/editlib/registry.cpp b/Externals/crystaledit/editlib/registry.cpp
index a425281..62abd08 100644 (file)
--- a/Externals/crystaledit/editlib/registry.cpp
+++ b/Externals/crystaledit/editlib/registry.cpp
@@ -26,7 +26,6 @@
 #define new DEBUG_NEW
 #endif
 
-#pragma warning ( disable : 4711 )
 /*////////////////////////////////////////////////////////////////////////////*/
 
 /* initializes registry value data */
@@ -1457,4 +1456,3 @@ void CReg::FindClose ()
 #endif /* cplusplus */
 
 /*////////////////////////////////////////////////////////////////////////////*/
-#pragma warning ( default : 4711 )

diff --git a/Externals/poco/Foundation/include/Poco/Platform_WIN32.h b/Externals/poco/Foundation/include/Poco/Platform_WIN32.h
index 58c9a7a..bae0de4 100644 (file)
--- a/Externals/poco/Foundation/include/Poco/Platform_WIN32.h
+++ b/Externals/poco/Foundation/include/Poco/Platform_WIN32.h
@@ -73,9 +73,7 @@
 
 // Turn off some annoying warnings
 #if defined(_MSC_VER)
-       #pragma warning(disable:4018) // signed/unsigned comparison
        #pragma warning(disable:4251) // ... needs to have dll-interface warning 
-       #pragma warning(disable:4355) // 'this' : used in base member initializer list
        #pragma warning(disable:4996) // VC++ 8.0 deprecation warnings
        #pragma warning(disable:4351) // new behavior: elements of array '...' will be default initialized
        #pragma warning(disable:4675) // resolved overload was found by argument-dependent lookup

diff --git a/Externals/poco/Foundation/src/HashStatistic.cpp b/Externals/poco/Foundation/src/HashStatistic.cpp
index 2a430c0..f024bfe 100644 (file)
--- a/Externals/poco/Foundation/src/HashStatistic.cpp
+++ b/Externals/poco/Foundation/src/HashStatistic.cpp
@@ -68,7 +68,7 @@ std::string HashStatistic::toString() const
        str << "  MaxEntry: " << _maxEntriesPerHash << "\n";
        str << "  AvgEntry: " << avgEntriesPerHash() << ", excl Zero slots: " << avgEntriesPerHashExclZeroEntries() << "\n";
        str << "  DetailedStatistics: \n";
-       for (int i = 0; i < _detailedEntriesPerHash.size(); ++i)
+       for (size_t i = 0; i < _detailedEntriesPerHash.size(); ++i)
        {
                // 10 entries per line
                if (i % 10 == 0)

diff --git a/Externals/poco/Foundation/src/Logger.cpp b/Externals/poco/Foundation/src/Logger.cpp
index 6037bf9..e0ba533 100644 (file)
--- a/Externals/poco/Foundation/src/Logger.cpp
+++ b/Externals/poco/Foundation/src/Logger.cpp
@@ -273,13 +273,13 @@ void Logger::formatDump(std::string& message, const void* buffer, std::size_t le
        message.reserve(message.size() + length*6);
        if (!message.empty()) message.append("\n");
        unsigned char* base = (unsigned char*) buffer;
-       int addr = 0;
+       size_t addr = 0;
        while (addr < length)
        {
                if (addr > 0) message.append("\n");
                message.append(NumberFormatter::formatHex(addr, 4));
                message.append("  ");
-               int offset = 0;
+               ptrdiff_t offset = 0;
                while (addr + offset < length && offset < BYTES_PER_LINE)
                {
                        message.append(NumberFormatter::formatHex(base[addr + offset], 2));

diff --git a/Externals/poco/Foundation/src/Path.cpp b/Externals/poco/Foundation/src/Path.cpp
index acc19df..79acef7 100644 (file)
--- a/Externals/poco/Foundation/src/Path.cpp
+++ b/Externals/poco/Foundation/src/Path.cpp
@@ -472,9 +472,9 @@ Path& Path::setDevice(const std::string& device)
        
 const std::string& Path::directory(int n) const
 {
-       poco_assert (0 <= n && n <= _dirs.size());
+       poco_assert (0 <= n && n <= (int)_dirs.size());
        
-       if (n < _dirs.size())
+       if (n < static_cast<int>(_dirs.size()))
                return _dirs[n];
        else
                return _name;   
@@ -483,9 +483,9 @@ const std::string& Path::directory(int n) const
 
 const std::string& Path::operator [] (int n) const
 {
-       poco_assert (0 <= n && n <= _dirs.size());
+       poco_assert (0 <= n && n <= (int)_dirs.size());
        
-       if (n < _dirs.size())
+       if (n < static_cast<int>(_dirs.size()))
                return _dirs[n];
        else
                return _name;   
@@ -865,7 +865,7 @@ void Path::parseVMS(const std::string& path)
                                                                {
                                                                        if (name == "-")
                                                                        {
-                                                                               if (_dirs.size() > d)
+                                                                               if (static_cast<int>(_dirs.size()) > d)
                                                                                        _dirs.pop_back();
                                                                        }
                                                                        else _dirs.push_back(name);

diff --git a/Externals/poco/Foundation/src/PurgeStrategy.cpp b/Externals/poco/Foundation/src/PurgeStrategy.cpp
index 86fe86e..e90fddd 100644 (file)
--- a/Externals/poco/Foundation/src/PurgeStrategy.cpp
+++ b/Externals/poco/Foundation/src/PurgeStrategy.cpp
@@ -128,7 +128,7 @@ void PurgeByCountStrategy::purge(const std::string& path)
 {
        std::vector<File> files;
        list(path, files);
-       while (files.size() > _count)
+       while (static_cast<int>(files.size()) > _count)
        {
                std::vector<File>::iterator it = files.begin();
                std::vector<File>::iterator purgeIt = it;

diff --git a/Externals/poco/Foundation/src/ThreadPool.cpp b/Externals/poco/Foundation/src/ThreadPool.cpp
index b15b28f..0f1b354 100644 (file)
--- a/Externals/poco/Foundation/src/ThreadPool.cpp
+++ b/Externals/poco/Foundation/src/ThreadPool.cpp
@@ -409,7 +409,7 @@ void ThreadPool::collect()
 void ThreadPool::housekeep()
 {
        _age = 0;
-       if (_threads.size() <= _minCapacity)
+       if (static_cast<int>(_threads.size()) <= _minCapacity)
                return;
 
        ThreadVec idleThreads;
@@ -461,7 +461,7 @@ PooledThread* ThreadPool::getThread()
        }
        if (!pThread)
        {
-               if (_threads.size() < _maxCapacity)
+               if (static_cast<int>(_threads.size()) < _maxCapacity)
                {
             pThread = createThread();
             try

diff --git a/Externals/poco/Foundation/src/pcre_config.h b/Externals/poco/Foundation/src/pcre_config.h
index 2502135..5f36ff7 100644 (file)
--- a/Externals/poco/Foundation/src/pcre_config.h
+++ b/Externals/poco/Foundation/src/pcre_config.h
@@ -336,6 +336,3 @@ them both to 0; an emulation function will be used. */
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
 
-#if defined(_MSC_VER)
-       #pragma warning(disable:4018) // signed/unsigned comparison
-#endif

diff --git a/Externals/poco/Util/src/Application.cpp b/Externals/poco/Util/src/Application.cpp
index c73056f..78fc040 100644 (file)
--- a/Externals/poco/Util/src/Application.cpp
+++ b/Externals/poco/Util/src/Application.cpp
@@ -352,7 +352,7 @@ void Application::setArgs(const std::vector<std::string>& args)
        _pConfig->setInt("application.argc", (int) args.size());
        _args = args;
        std::string argvKey = "application.argv[";
-       for (int i = 0; i < args.size(); ++i)
+       for (int i = 0; i < static_cast<int>(args.size()); ++i)
        {
                _pConfig->setString(argvKey + NumberFormatter::format(i) + "]", args[i]);
        }

diff --git a/Externals/poco/Util/src/HelpFormatter.cpp b/Externals/poco/Util/src/HelpFormatter.cpp
index e2257d2..0d36e50 100644 (file)
--- a/Externals/poco/Util/src/HelpFormatter.cpp
+++ b/Externals/poco/Util/src/HelpFormatter.cpp
@@ -277,7 +277,7 @@ void HelpFormatter::formatText(std::ostream& ostr, const std::string& text, int
 
 void HelpFormatter::formatWord(std::ostream& ostr, int& pos, const std::string& word, int indent) const
 {
-       if (pos + word.length() > _width)
+       if (pos + static_cast<int>(word.length()) > _width)
        {
                ostr << '\n';
                pos = 0;

diff --git a/Src/Common/ExConverter.cpp b/Src/Common/ExConverter.cpp
index 23a9eb8..0ac4846 100644 (file)
--- a/Src/Common/ExConverter.cpp
+++ b/Src/Common/ExConverter.cpp
@@ -169,7 +169,7 @@ public:
                                        codepagestotry[0] = ucr::CP_UTF_8;
                        }
                        codepage = defcodepage;
-                       int i;
+                       size_t i;
                        for (i = 0; i < sizeof(codepagestotry)/sizeof(codepagestotry[0]) - 1; i++)
                        {
                                if (codepagestotry[i] == 0) break;

diff --git a/Src/Common/lwdisp.h b/Src/Common/lwdisp.h
index 431af3e..ca254da 100644 (file)
--- a/Src/Common/lwdisp.h
+++ b/Src/Common/lwdisp.h
@@ -29,7 +29,6 @@ extern "C"{
 #endif 
 
 #ifdef _MSC_VER
-#pragma warning(disable: 4100 4189 4512)
 #define UNUSED_ARG(ARG) ARG
 #elif defined(__GNUC__)
 #define UNUSED_ARG(ARG) ARG

diff --git a/Src/Common/unicoder.cpp b/Src/Common/unicoder.cpp
index 3f51f1b..c6a4b29 100644 (file)
--- a/Src/Common/unicoder.cpp
+++ b/Src/Common/unicoder.cpp
@@ -41,7 +41,6 @@ static int f_nDefaultCodepage = GetACP();
  */
 int Ucs4_to_Utf8(unsigned unich, unsigned char * utf8)
 {
-#pragma warning(disable: 4244) // possible loss of data due to type conversion
        if (unich <= 0x7f)
        {
                utf8[0] = (unsigned char)unich;
@@ -94,7 +93,6 @@ int Ucs4_to_Utf8(unsigned unich, unsigned char * utf8)
                utf8[0] = '?';
                return 1;
        }
-#pragma warning(default: 4244) // possible loss of data due to type conversion
 }
 
 /**
@@ -207,7 +205,6 @@ unsigned GetUtf8Char(unsigned char * str)
  */
 int to_utf8_advance(unsigned u, unsigned char * &lpd)
 {
-#pragma warning(disable: 4244) // possible loss of data due to type conversion
        if (u < 0x80)
        {
                *lpd++ = u;
@@ -258,7 +255,6 @@ int to_utf8_advance(unsigned u, unsigned char * &lpd)
                *lpd++ = '?';
                return 1;
        }
-#pragma warning(default: 4244) // possible loss of data due to type conversion
 }
 
 /**
@@ -970,7 +966,7 @@ bool convert(UNICODESET unicoding1, int codepage1, const unsigned char * src, si
        {
                // simple byte swap
                dest->resize(srcbytes + 2);
-               for (int i = 0; i < srcbytes; i += 2)
+               for (size_t i = 0; i < srcbytes; i += 2)
                {
                        // Byte-swap into destination
                        dest->ptr[i] = src[i+1];

diff --git a/Src/ConfigLog.cpp b/Src/ConfigLog.cpp
index d062f54..15d9772 100644 (file)
--- a/Src/ConfigLog.cpp
+++ b/Src/ConfigLog.cpp
@@ -69,8 +69,7 @@ void CConfigLog::WritePluginsInLogFile(LPCWSTR transformationEvent)
        piPluginArray = 
                CAllThreadsScripts::GetActiveSet()->GetAvailableScripts(transformationEvent);
 
-       int iPlugin;
-       for (iPlugin = 0 ; iPlugin < piPluginArray->size() ; iPlugin++)
+       for (size_t iPlugin = 0 ; iPlugin < piPluginArray->size() ; iPlugin++)
        {
                const PluginInfoPtr& plugin = piPluginArray->at(iPlugin);
                m_pfile->WriteString(_T("\r\n  "));

diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
index 3dc885c..d93e153 100644 (file)
--- a/Src/DirActions.cpp
+++ b/Src/DirActions.cpp
@@ -1342,14 +1342,14 @@ AllowUpwardDirectory::ReturnCode
 CheckAllowUpwardDirectory(const CDiffContext& ctxt, const CTempPathContext *pTempPathContext, PathContext &pathsParent)
 {
        std::vector<String> path(ctxt.GetCompareDirs());
-       for (int i = 0; i < path.size(); ++i)
+       for (int i = 0; i < static_cast<int>(path.size()); ++i)
                path[i] = ctxt.GetNormalizedPath(i);
 
        // If we have temp context it means we are comparing archives
        if (pTempPathContext)
        {
                std::vector<String> name(path.size());
-               for (int i = 0; i < path.size(); ++i)
+               for (int i = 0; i < static_cast<int>(path.size()); ++i)
                        name[i] = paths::FindFileName(path[i]);
 
                String::size_type cchLeftRoot = pTempPathContext->m_strRoot[0].length();
@@ -1358,13 +1358,13 @@ CheckAllowUpwardDirectory(const CDiffContext& ctxt, const CTempPathContext *pTem
                        pathsParent.SetSize(ctxt.GetCompareDirs());
                        if (pTempPathContext->m_pParent)
                        {
-                               for (int i = 0; i < path.size(); ++i)
+                               for (int i = 0; i < static_cast<int>(path.size()); ++i)
                                        pathsParent[i] = pTempPathContext->m_pParent->m_strRoot[i];
                                if (paths::GetPairComparability(pathsParent) != paths::IS_EXISTING_DIR)
                                        return AllowUpwardDirectory::Never;
                                return AllowUpwardDirectory::ParentIsTempPath;
                        }
-                       for (int i = 0; i < path.size(); ++i)
+                       for (int i = 0; i < static_cast<int>(path.size()); ++i)
                                pathsParent[i] = pTempPathContext->m_strDisplayRoot[i];
                        if (pathsParent.size() < 3)
                        {
@@ -1380,9 +1380,9 @@ CheckAllowUpwardDirectory(const CDiffContext& ctxt, const CTempPathContext *pTem
                                strutils::compare_nocase(name[0], _T("ORIGINAL")) == 0 && 
                                strutils::compare_nocase(name[1], _T("ALTERED")) == 0)
                        {
-                               for (int i = 0; i < path.size(); ++i)
+                               for (int i = 0; i < static_cast<int>(path.size()); ++i)
                                        pathsParent[i] = paths::GetParentPath(pathsParent[i]);
-                               for (int i = 0; i < path.size(); ++i)
+                               for (int i = 0; i < static_cast<int>(path.size()); ++i)
                                        name[i] = paths::FindFileName(pathsParent[i]);
                                if (strutils::compare_nocase(name[0], name[1]) == 0)
                                {
@@ -1397,7 +1397,7 @@ CheckAllowUpwardDirectory(const CDiffContext& ctxt, const CTempPathContext *pTem
 
        // If regular parent folders exist, allow opening them
        pathsParent.SetSize(ctxt.GetCompareDirs());
-       for (int i = 0; i < path.size(); ++i)
+       for (int i = 0; i < static_cast<int>(path.size()); ++i)
                pathsParent[i] = paths::GetParentPath(path[i]);
        if (paths::GetPairComparability(pathsParent) != paths::IS_EXISTING_DIR)
                return AllowUpwardDirectory::Never;

diff --git a/Src/DirItem.h b/Src/DirItem.h
index c2b3296..cff1496 100644 (file)
--- a/Src/DirItem.h
+++ b/Src/DirItem.h
@@ -21,10 +21,6 @@
  */
 #pragma once
 
-#ifdef _MSC_VER
-#pragma warning(disable: 4520)
-#endif
-
 #define POCO_NO_UNWINDOWS 1
 #include <Poco/File.h>
 #include <Poco/Timestamp.h>

diff --git a/Src/DirScan.cpp b/Src/DirScan.cpp
index fbd1101..55d82fe 100644 (file)
--- a/Src/DirScan.cpp
+++ b/Src/DirScan.cpp
@@ -470,7 +470,7 @@ int DirScan_CompareItems(DiffFuncStruct *myStruct, uintptr_t parentdiffpos)
        std::vector<DiffWorkerPtr> workers;
        NotificationQueue queue;
        myStruct->context->m_pCompareStats->SetCompareThreadCount(nworkers);
-       for (unsigned i = 0; i < nworkers; ++i)
+       for (int i = 0; i < nworkers; ++i)
        {
                workers.push_back(DiffWorkerPtr(new DiffWorker(queue, myStruct->context, i)));
                threadPool.start(*workers[i]);

diff --git a/Src/FileTransform.cpp b/Src/FileTransform.cpp
index 79f7ddb..6ee9d4f 100644 (file)
--- a/Src/FileTransform.cpp
+++ b/Src/FileTransform.cpp
@@ -450,7 +450,7 @@ void GetFreeFunctionsInScripts(std::vector<String>& sNamesArray, const wchar_t *
 
        // fill in these structures
        int nFnc = 0;   
-       int iScript;
+       size_t iScript;
        for (iScript = 0 ; iScript < piScriptArray->size() ; iScript++)
        {
                const PluginInfoPtr & plugin = piScriptArray->at(iScript);
@@ -479,7 +479,7 @@ bool Interactive(String & text, const wchar_t *TransformationEvent, int iFncChos
        PluginArray * piScriptArray = 
                CAllThreadsScripts::GetActiveSet()->GetAvailableScripts(TransformationEvent);
 
-       int iScript;
+       size_t iScript;
        for (iScript = 0 ; iScript < piScriptArray->size() ; iScript++)
        {
                if (iFncChosen < piScriptArray->at(iScript)->m_nFreeFunctions)

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index a5c0a3f..c50bae9 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -2492,7 +2492,7 @@ void CMainFrame::OnUpdateCompareMethod(CCmdUI* pCmdUI)
 void CMainFrame::OnMRUs(UINT nID)
 {
        std::vector<JumpList::Item> mrus = JumpList::GetRecentDocs(GetOptionsMgr()->GetInt(OPT_MRU_MAX));
-       const int idx = nID - ID_MRU_FIRST;
+       const size_t idx = nID - ID_MRU_FIRST;
        if (idx < mrus.size())
        {
                MergeCmdLineInfo cmdInfo((_T("\"") + mrus[idx].path + _T("\" ") + mrus[idx].params).c_str());
@@ -2508,7 +2508,7 @@ void CMainFrame::OnUpdateNoMRUs(CCmdUI* pCmdUI)
                return;
        
        // empty the menu
-       int i = ::GetMenuItemCount(hMenu);
+       size_t i = ::GetMenuItemCount(hMenu);
        while (i --)
                ::DeleteMenu(hMenu, 0, MF_BYPOSITION);
 

diff --git a/Src/Merge.vs2015.vcxproj b/Src/Merge.vs2015.vcxproj
index 0cad9ff..69c5f40 100644 (file)
--- a/Src/Merge.vs2015.vcxproj
+++ b/Src/Merge.vs2015.vcxproj
@@ -194,7 +194,7 @@
       <Optimization>MinSpace</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
       <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WINVER=0x0501;WIN64;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WINVER=0x0501;WIN64;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r

diff --git a/Src/Merge.vs2017.vcxproj b/Src/Merge.vs2017.vcxproj
index 64884b6..0d57974 100644 (file)
--- a/Src/Merge.vs2017.vcxproj
+++ b/Src/Merge.vs2017.vcxproj
@@ -194,7 +194,7 @@
       <Optimization>MinSpace</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
       <AdditionalIncludeDirectories>.;.\CompareEngines;.\Common;..\Externals\crystaledit\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\boost;..\Externals\poco\Foundation\include;..\Externals\poco\XML\include;..\Externals\poco\Util\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WINVER=0x0501;WIN64;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WINVER=0x0501;WIN64;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME="pr";DIFF_PROGRAM="diff";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 8194f75..e39ea9a 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -125,9 +125,6 @@ END_MESSAGE_MAP()
 /////////////////////////////////////////////////////////////////////////////
 // CMergeDoc construction/destruction
 
-
-#pragma warning(disable:4355)
-
 /**
  * @brief Constructor.
  */
@@ -170,8 +167,6 @@ CMergeDoc::CMergeDoc()
        m_diffWrapper.SetPrediffer(NULL);
 }
 
-#pragma warning(default:4355)
-
 /**
  * @brief Destructor.
  *
@@ -468,7 +463,7 @@ int CMergeDoc::Rescan(bool &bBinary, IDENTLEVEL &identical,
                const std::vector<std::vector<int> > syncpoints = GetSyncPointList();   
                int nStartLine[3] = {0};
                int nLines[3], nRealLine[3];
-               for (int i = 0; i <= syncpoints.size(); ++i)
+               for (size_t i = 0; i <= syncpoints.size(); ++i)
                {
                        // Save text buffer to file
                        for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
@@ -3458,7 +3453,7 @@ std::vector<std::vector<int> > CMergeDoc::GetSyncPointList()
                        if (m_ptBuf[nBuffer]->GetLineFlags(nLine) & LF_INVALID_BREAKPOINT)
                        {
                                idx[nBuffer]++;
-                               if (list.size() <= idx[nBuffer])
+                               if (static_cast<int>(list.size()) <= idx[nBuffer])
                                        list.push_back(points);
                                list[idx[nBuffer]][nBuffer] = nLine;
                        }

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 3c9e672..8b2272e 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -2511,7 +2511,7 @@ HMENU CMergeEditView::createScriptsSubmenu(HMENU hMenu)
        FileTransform::GetFreeFunctionsInScripts(functionNamesList, L"EDITOR_SCRIPT");
 
        // empty the menu
-       int i = GetMenuItemCount(hMenu);
+       size_t i = GetMenuItemCount(hMenu);
        while (i --)
                DeleteMenu(hMenu, 0, MF_BYPOSITION);
 
@@ -2574,7 +2574,7 @@ HMENU CMergeEditView::createPrediffersSubmenu(HMENU hMenu)
        AppendMenu(hMenu, MF_STRING, ID_SUGGESTED_PLUGINS, _("Suggested plugins").c_str());
 
        int ID = ID_PREDIFFERS_FIRST;   // first ID in menu
-       int iScript;
+       size_t iScript;
        for (iScript = 0 ; iScript < piScriptArray->size() ; iScript++, ID ++)
        {
                const PluginInfoPtr & plugin = piScriptArray->at(iScript);
@@ -3069,7 +3069,7 @@ void CMergeEditView::SetPredifferByMenu(UINT nID )
  */
 int CMergeEditView::FindPrediffer(LPCTSTR prediffer) const
 {
-       int i;
+       size_t i;
        int ID = ID_PREDIFFERS_FIRST;
 
        // Search file prediffers

diff --git a/Src/Plugins.cpp b/Src/Plugins.cpp
index bbaa411..67614e0 100644 (file)
--- a/Src/Plugins.cpp
+++ b/Src/Plugins.cpp
@@ -588,8 +588,7 @@ static vector<String>& LoadTheScriptletList()
                scriptletsLoaded = true;
 
                // lock the *.sct to avoid them being deleted/moved away
-               int i;
-               for (i = 0 ; i < theScriptletList.size() ; i++)
+               for (size_t i = 0 ; i < theScriptletList.size() ; i++)
                {
                        String scriptlet = theScriptletList.at(i);
                        if (scriptlet.length() > 4 && strutils::compare_nocase(scriptlet.substr(scriptlet.length() - 4), _T(".sct")) != 0)
@@ -625,8 +624,7 @@ static void UnloadTheScriptletList()
        FastMutex::ScopedLock lock(scriptletsSem);
        if (scriptletsLoaded)
        {
-               int i;
-               for (i = 0 ; i < theScriptletHandleList.size() ; i++)
+               for (size_t i = 0 ; i < theScriptletHandleList.size() ; i++)
                {
                        HANDLE hFile = theScriptletHandleList.at(i);
                        if (hFile != 0)
@@ -644,7 +642,7 @@ static void UnloadTheScriptletList()
  */
 static void RemoveScriptletCandidate(const String &scriptletFilepath)
 {
-       for (int i=0; i<theScriptletList.size(); ++i)
+       for (size_t i=0; i<theScriptletList.size(); ++i)
        {
                if (scriptletFilepath == theScriptletList[i])
                {
@@ -681,9 +679,8 @@ static PluginArray * GetAvailableScripts( const wchar_t *transformationEvent)
 
        PluginArray * pPlugins = new PluginArray;
 
-       int i;
        std::list<String> badScriptlets;
-       for (i = 0 ; i < scriptlets.size() ; i++)
+       for (size_t i = 0 ; i < scriptlets.size() ; i++)
        {
                // Note all the info about the plugin
                PluginInfoPtr plugin(new PluginInfo);
@@ -778,7 +775,7 @@ void CScriptsOfThread::SaveSettings()
        {
                if (m_aPluginsByEvent[i] == NULL)
                        m_aPluginsByEvent[i].reset(::GetAvailableScripts(TransformationCategories[i]));
-               for (int j = 0; j < m_aPluginsByEvent[i]->size(); ++j)
+               for (size_t j = 0; j < m_aPluginsByEvent[i]->size(); ++j)
                {
                        const PluginInfoPtr & plugin = m_aPluginsByEvent[i]->at(j);
                        if (plugin->m_disabled)
@@ -815,7 +812,7 @@ void CScriptsOfThread::FreeScriptsForEvent(const wchar_t *transformationEvent)
 PluginInfo *CScriptsOfThread::GetAutomaticPluginByFilter(const wchar_t *transformationEvent, const String& filteredText)
 {
        PluginArray * piFileScriptArray = GetAvailableScripts(transformationEvent);
-       for (int step = 0 ; step < piFileScriptArray->size() ; step ++)
+       for (size_t step = 0 ; step < piFileScriptArray->size() ; step ++)
        {
                const PluginInfoPtr & plugin = piFileScriptArray->at(step);
                if (plugin->m_bAutomatic == false || plugin->m_disabled)
@@ -829,14 +826,13 @@ PluginInfo *CScriptsOfThread::GetAutomaticPluginByFilter(const wchar_t *transfor
 
 PluginInfo * CScriptsOfThread::GetPluginByName(const wchar_t *transformationEvent, const String& name)
 {
-       int i;
-       for (i = 0 ; i < nTransformationEvents ; i ++)
+       for (int i = 0 ; i < nTransformationEvents ; i ++)
                if (!transformationEvent || wcscmp(transformationEvent, TransformationCategories[i]) == 0)
                {
                        if (m_aPluginsByEvent[i] == NULL)
                                m_aPluginsByEvent[i].reset(::GetAvailableScripts(TransformationCategories[i]));
 
-                       for (int j = 0 ; j <  m_aPluginsByEvent[i]->size() ; j++)
+                       for (size_t j = 0 ; j <  m_aPluginsByEvent[i]->size() ; j++)
                                if (m_aPluginsByEvent[i]->at(j)->m_name == name)
                                        return m_aPluginsByEvent[i]->at(j).get();
                }
@@ -845,13 +841,12 @@ PluginInfo * CScriptsOfThread::GetPluginByName(const wchar_t *transformationEven
 
 PluginInfo *  CScriptsOfThread::GetPluginInfo(LPDISPATCH piScript)
 {
-       int i, j;
-       for (i = 0 ; i < nTransformationEvents ; i ++) 
+       for (int i = 0 ; i < nTransformationEvents ; i ++) 
        {
                if (m_aPluginsByEvent[i] == NULL)
                        continue;
                const PluginArrayPtr& pArray = m_aPluginsByEvent[i];
-               for (j = 0 ; j < pArray->size() ; j++)
+               for (size_t j = 0 ; j < pArray->size() ; j++)
                        if ((*pArray)[j]->m_lpDispatch == piScript)
                                return (*pArray)[j].get();
        }
@@ -891,8 +886,7 @@ CScriptsOfThread * CAllThreadsScripts::GetActiveSet()
 {
        FastMutex::ScopedLock lock(m_aAvailableThreadsLock);
        unsigned long nThreadId = GetCurrentThreadId();
-       int i;
-       for (i = 0 ; i < m_aAvailableThreads.size() ; i++)
+       for (size_t i = 0 ; i < m_aAvailableThreads.size() ; i++)
                if (m_aAvailableThreads[i] && m_aAvailableThreads[i]->m_nThreadId == nThreadId)
                        return m_aAvailableThreads[i];
        assert(0);
@@ -902,8 +896,7 @@ CScriptsOfThread * CAllThreadsScripts::GetActiveSetNoAssert()
 {
        FastMutex::ScopedLock lock(m_aAvailableThreadsLock);
        unsigned long nThreadId = GetCurrentThreadId();
-       int i;
-       for (i = 0 ; i < m_aAvailableThreads.size() ; i++)
+       for (size_t i = 0 ; i < m_aAvailableThreads.size() ; i++)
                if (m_aAvailableThreads[i] && m_aAvailableThreads[i]->m_nThreadId == nThreadId)
                        return m_aAvailableThreads[i];
        return NULL;

diff --git a/Src/PluginsListDlg.cpp b/Src/PluginsListDlg.cpp
index 9f0c60b..6807cd0 100644 (file)
--- a/Src/PluginsListDlg.cpp
+++ b/Src/PluginsListDlg.cpp
@@ -104,7 +104,7 @@ void PluginsListDlg::AddPluginsToList(const wchar_t *pluginEvent, const String&
        PluginArray * piPluginArray = 
                CAllThreadsScripts::GetActiveSet()->GetAvailableScripts(pluginEvent);
 
-       for (int iPlugin = 0 ; iPlugin < piPluginArray->size() ; iPlugin++)
+       for (size_t iPlugin = 0 ; iPlugin < piPluginArray->size() ; iPlugin++)
        {
                const PluginInfoPtr& plugin = piPluginArray->at(iPlugin);
                int ind = m_list.InsertItem(m_list.GetItemCount(), plugin->m_name.c_str());

diff --git a/Src/SelectUnpackerDlg.cpp b/Src/SelectUnpackerDlg.cpp
index 9056323..4619e60 100644 (file)
--- a/Src/SelectUnpackerDlg.cpp
+++ b/Src/SelectUnpackerDlg.cpp
@@ -70,7 +70,7 @@ void CSelectUnpackerDlg::Initialize()
        m_UnpackerPlugins.Add(automaticPlugin.get());
        m_bWithFileFlags.push_back(true);
        // add the real unpackers to the unpackers list
-       int i;
+       size_t i;
        for (i = 0 ; i < piFileScriptArray->size() ; i++)
        {
                // during the dialog, we use a pointer to the scriptsOfThreads array

diff --git a/Src/markdown.cpp b/Src/markdown.cpp
index ca78191..07c5717 100644 (file)
--- a/Src/markdown.cpp
+++ b/Src/markdown.cpp
@@ -292,12 +292,12 @@ CMarkdown::operator bool()
 
 size_t CMarkdown::FindTag(const char *tags, const char *markup) const
 {
-       while (size_t len = strlen(tags))
+       while (ptrdiff_t len = strlen(tags))
        {
                unsigned char c;
                if
                (
-                       ahead - markup > len
+                       (ahead - markup) > len
                &&      memcmp(markup, tags, len) == 0
                &&      (isspace(c = markup[len]) || c == '[' || c == '>' || c == '"' || c == '\'' || c == '=')
                )
@@ -796,7 +796,7 @@ CMarkdown::FileImage::FileImage(const TCHAR *path, size_t trunc, unsigned flags)
                        pCopy = new unsigned char[cbImage];
                        if (pCopy)
                        {
-                               for (int i = 0; i < cbImage / 2; ++i)
+                               for (size_t i = 0; i < cbImage / 2; ++i)
                                        *((uint16_t *)pCopy + i) = Poco::ByteOrder::flipBytes(*((uint16_t *)pImage + i));
                        }
 
@@ -837,7 +837,7 @@ CMarkdown::FileImage::FileImage(const TCHAR *path, size_t trunc, unsigned flags)
                        pCopy = new unsigned char[cbImage];
                        if (pCopy)
                        {
-                               for (int i = 0; i < cbImage / 2; ++i)
+                               for (size_t i = 0; i < cbImage / 2; ++i)
                                        *((uint16_t *)pCopy + i) = Poco::ByteOrder::flipBytes(*((uint16_t *)pImage + i));
                        }
                        delete m_pSharedMemory;
@@ -871,7 +871,7 @@ CMarkdown::FileImage::FileImage(const TCHAR *path, size_t trunc, unsigned flags)
                                if (pCopy2)
                                {
                                        cbImage = 0;
-                                       for (int i = 0; i < cchImage; i += 4)
+                                       for (size_t i = 0; i < cchImage; i += 4)
                                        {
                                                memcpy(&uch, pchImage + i, 4);
                                                if (nByteOrder & 2)