[Winmerge-svn] SF.net SVN: winmerge:[5658] trunk/Src/Common

[<jt...@us...>]

Revision: 5658
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5658&view=rev
Author:   jtuc
Date:     2008-07-22 16:32:39 +0000 (Tue, 22 Jul 2008)

Log Message:
-----------
VC6 issues

Modified Paths:
--------------
    trunk/Src/Common/OptionsMgr.cpp
    trunk/Src/Common/RegOptionsMgr.cpp

Modified: trunk/Src/Common/OptionsMgr.cpp
===================================================================
--- trunk/Src/Common/OptionsMgr.cpp	2008-07-22 16:31:42 UTC (rev 5657)
+++ trunk/Src/Common/OptionsMgr.cpp	2008-07-22 16:32:39 UTC (rev 5658)
@@ -28,6 +28,10 @@
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
+// Disable VC6's "identifier was truncated..." warning. It is meaningless.
+#if _MSC_VER == 1200
+	#pragma warning(disable: 4786)
+#endif
 #include <windows.h>
 #include <tchar.h>
 #include <algorithm>

Modified: trunk/Src/Common/RegOptionsMgr.cpp
===================================================================
--- trunk/Src/Common/RegOptionsMgr.cpp	2008-07-22 16:31:42 UTC (rev 5657)
+++ trunk/Src/Common/RegOptionsMgr.cpp	2008-07-22 16:32:39 UTC (rev 5658)
@@ -7,6 +7,10 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
+// Disable VC6's "identifier was truncated..." warning. It is meaningless.
+#if _MSC_VER == 1200
+	#pragma warning(disable: 4786)
+#endif
 #include <windows.h>
 #include <tchar.h>
 #include "OptionsMgr.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.