From 6d24433cc5234f7ef617a0c2024fff7b7a00f12c Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Sun, 2 Dec 2007 08:09:16 +0000
Subject: [PATCH] cosmetics.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21902 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/support/lyxsum.cpp | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/support/lyxsum.cpp b/src/support/lyxsum.cpp
index b547b4ecbc..e191a32bb8 100644
--- a/src/support/lyxsum.cpp
+++ b/src/support/lyxsum.cpp
@@ -111,42 +111,30 @@ namespace lyx {
 namespace support {
 
 using std::ifstream;
-#if HAVE_DECL_ISTREAMBUF_ITERATOR
 using std::istreambuf_iterator;
+using std::istream_iterator;
+using std::ios;
+using std::ios_base;
 
 unsigned long sum(char const * file)
 {
-	//LYXERR(Debug::FILES, "lyx::sum() using istreambuf_iterator (fast)");
-
-	ifstream ifs(file, std::ios_base::in | std::ios_base::binary);
+	ifstream ifs(file, ios_base::in | ios_base::binary);
 	if (!ifs)
 		return 0;
 
+#if HAVE_DECL_ISTREAMBUF_ITERATOR
+	//LYXERR(Debug::FILES, "lyx::sum() using istreambuf_iterator (fast)");
 	istreambuf_iterator<char> beg(ifs);
 	istreambuf_iterator<char> end;
-
-	return do_crc(beg,end);
-}
 #else
-
-using std::istream_iterator;
-using std::ios;
-
-unsigned long sum(char const * file)
-{
 	//LYXERR(Debug::FILES, "lyx::sum() using istream_iterator (slow as a snail)");
-
-	ifstream ifs(file, std::ios_base::in | std::ios_base::binary);
-	if (!ifs)
-		return 0;
-
 	ifs.unsetf(ios::skipws);
 	istream_iterator<char> beg(ifs);
 	istream_iterator<char> end;
+#endif
 
 	return do_crc(beg,end);
 }
-#endif
 
 } // namespace support
 } // namespace lyx
-- 
2.39.5