diff -r 21a6c17f4e3e -r 629f61203db1 test/VersionDictionary_test.cpp
--- a/test/VersionDictionary_test.cpp	Mon Sep 28 23:39:08 2009 -0700
+++ b/test/VersionDictionary_test.cpp	Tue Sep 29 15:46:42 2009 -0700
@@ -46,16 +46,16 @@
 
 TEST(File,HasPath) {
     {
-        File f("/tmp/jubba", O_RDWR | O_CREAT | O_TRUNC, true);
+        File f("/tmp/jubba", O_RDWR | O_CREAT | O_TRUNC);
         f.write("howdy");
     }
     {
-        File f("/tmp/jubba", O_RDWR, true);
+        File f("/tmp/jubba", O_RDWR);
         EXPECT_TRUE(f.hasPath("/tmp/jubba"));
         File::unlink("/tmp/jubba");
         EXPECT_FALSE(f.hasPath("/tmp/jubba"));
 
-        File f2("/tmp/jubba", O_RDWR | O_CREAT | O_TRUNC, true);
+        File f2("/tmp/jubba", O_RDWR | O_CREAT | O_TRUNC);
         f2.write("howdy");
         f2.flush();
 
@@ -108,7 +108,7 @@
     time_t startTime = ::time(NULL);
     time_t createTime;
     {
-        File file("/tmp/hashfiletest", O_RDWR | O_CREAT | O_TRUNC, true);
+        File file("/tmp/hashfiletest", O_RDWR | O_CREAT | O_TRUNC);
         VersionDictionary *hf;
         {
             Timer t("Creating & writing VersionDictionary", nWords);
@@ -124,7 +124,7 @@
         delete hf;
     }
     {
-        File file("/tmp/hashfiletest");
+        File file("/tmp/hashfiletest", O_RDONLY);
         VersionDictionary hf(&file);
         ASSERT_EQ(0, hf.generation());
         ASSERT_EQ(createTime, hf.timestamp());
@@ -152,7 +152,7 @@
     }
     {
         printf("Opening OverlayVersionDictionary...\n");
-        File file("/tmp/hashfiletest", O_RDWR, true);
+        File file("/tmp/hashfiletest", O_RDWR);
         OverlayVersionDictionary hf(&file);
         EXPECT_EQ( nWords ,  hf.count() );
         EXPECT_TRUE(hf.get("abatement").equals("abatement"));
@@ -196,7 +196,7 @@
     }
     {
         printf("Re-opening OverlayVersionDictionary...\n");
-        File file("/tmp/hashfiletest");
+        File file("/tmp/hashfiletest", O_RDONLY);
         OverlayVersionDictionary hf(&file);
         
         ASSERT_EQ(1, hf.generation());
@@ -222,17 +222,17 @@
     }
     {
         printf("Writing VersionDictionary to a new file...\n");
-        File oldFile("/tmp/hashfiletest");
+        File oldFile("/tmp/hashfiletest", O_RDONLY);
         OverlayVersionDictionary oldhf(&oldFile);
         
-        File newFile("/tmp/hashfiletest2", O_RDWR | O_CREAT | O_TRUNC, true);
+        File newFile("/tmp/hashfiletest2", O_RDWR | O_CREAT | O_TRUNC);
         newFile.write("Ha5h", 4);     // VersionDictionary won't write to an empty file
         oldhf.saveAs(&newFile);
         printf("File size: %llu bytes\n", newFile.length());
     }
     {
         printf("Opening new file...\n");
-        File file("/tmp/hashfiletest2");
+        File file("/tmp/hashfiletest2", O_RDONLY);
         OverlayVersionDictionary hf(&file);
         
         EXPECT_EQ( nWords ,  hf.count() );