[Debtags-commits] [svn] r1832 - in tagcoll/2.0: . tagcoll/diskindex

[Peter Rockai]

Author: mornfall-guest
Date: Wed Jul 12 13:05:57 2006
New Revision: 1832

Modified:
   tagcoll/2.0/   (props changed)
   tagcoll/2.0/tagcoll/diskindex/mmap.cc
Log:
 r3134 at eriador:  mornfall | 2006-07-12 15:00:33 +0200
 Fix compile error with current libwibble and g++ 4.1.2.


Modified: tagcoll/2.0/tagcoll/diskindex/mmap.cc
==============================================================================
--- tagcoll/2.0/tagcoll/diskindex/mmap.cc	(original)
+++ tagcoll/2.0/tagcoll/diskindex/mmap.cc	Wed Jul 12 13:05:57 2006
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-using namespace std;
+// using namespace std;
 using namespace wibble;
 
 namespace tagcoll {
@@ -80,7 +80,7 @@
 	if (m_size == 0)
 		throw wibble::exception::Consistency("ensuring that there is data in the index",
 									"the mmap index file " + filename + " is empty");
-	
+
 	// Map the file into memory
 	if ((m_buf = (const char*)::mmap(0, m_size, PROT_READ, MAP_PRIVATE, m_fd, 0)) == MAP_FAILED)
 		throw wibble::exception::System("mmapping file " + m_filename);
@@ -121,7 +121,7 @@
 			throw wibble::exception::ValOutOfRange<size_t>("index ID", idx, 0, i, "looking for subindex in " + master.m_filename);
 		m_size = *(int*)m_buf;
 	}
-	
+
 	// Work with the subindex data, skipping the subindex chain size word
 	m_buf += sizeof(int);
 }
@@ -182,7 +182,7 @@
 	// Write one byte at the end to actually resize the file
 	if (::write(fd, &size, sizeof(int)) != sizeof(int))
 		throw wibble::exception::File(tmpname, "writing size word");
-	
+
 	// Write the index data
 	if (::write(fd, buf, size) != size)
 		throw wibble::exception::File(tmpname, "writing subindex");