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

[<mar...@us...>]

Revision: 5756
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5756&view=rev
Author:   marcelgosselin
Date:     2008-08-08 02:30:29 +0000 (Fri, 08 Aug 2008)

Log Message:
-----------
Remove "using namespace CompareEngines" to prevent polluting the global namespace.

Modified Paths:
--------------
    trunk/Src/CompareEngines/ByteComparator.cpp
    trunk/Src/FolderCmp.cpp

Modified: trunk/Src/CompareEngines/ByteComparator.cpp
===================================================================
--- trunk/Src/CompareEngines/ByteComparator.cpp	2008-08-08 02:24:18 UTC (rev 5755)
+++ trunk/Src/CompareEngines/ByteComparator.cpp	2008-08-08 02:30:29 UTC (rev 5756)
@@ -6,7 +6,7 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "ByteComparator.h"
 #include "FileTextStats.h"
 #include "CompareOptions.h"
@@ -17,8 +17,6 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
-using namespace CompareEngines;
-
 /**
  * @brief Returns if given char is EOL byte.
  * @param [in] ch Char to test.
@@ -112,6 +110,9 @@
 	}
 }
 
+namespace CompareEngines
+{
+
 /**
  * @brief Constructor taking compare options as parameters.
  * @param [in] options Compare options.
@@ -505,3 +506,6 @@
 		return RESULT_SAME;
 	}
 }
+
+} //namespace namespace CompareEngines
+

Modified: trunk/Src/FolderCmp.cpp
===================================================================
--- trunk/Src/FolderCmp.cpp	2008-08-08 02:24:18 UTC (rev 5755)
+++ trunk/Src/FolderCmp.cpp	2008-08-08 02:30:29 UTC (rev 5756)
@@ -6,7 +6,7 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "DiffUtils.h"
 #include "ByteCompare.h"
 #include "LogFile.h"
@@ -16,13 +16,13 @@
 #include "DiffContext.h"
 #include "DiffWrapper.h"
 #include "FileTransform.h"
-#include "diff.h"
+#include "DIFF.H"
 #include "IAbortable.h"
 #include "FolderCmp.h"
 #include "ByteComparator.h"
 #include "codepage_detect.h"
 
-using namespace CompareEngines;
+using CompareEngines::ByteCompare;
 
 static void GetComparePaths(CDiffContext * pCtxt, const DIFFITEM &di, String & left, String & right);
 static bool Unpack(String & filepathTransformed,


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