clean up includes

git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@530 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe

datapage.cpp

@@ -86,7 +86,7 @@ void DataPage<TUPLE>::initialize(int xid)
 }
 
 template <class TUPLE>
-inline bool DataPage<TUPLE>::append(int xid, TUPLE const & dat)
+bool DataPage<TUPLE>::append(int xid, TUPLE const & dat)
 {
     assert(byte_offset >= HEADER_SIZE);
     assert(fix_pcount >= 1);

datapage.h

@@ -59,7 +59,7 @@ public:
 
     ~DataPage();
 
-    inline bool append(int xid, TUPLE const & dat);
+    bool append(int xid, TUPLE const & dat);
     bool recordRead(int xid, typename TUPLE::key_t key, size_t keySize,  TUPLE ** buf);
 
     inline uint16_t recordCount(int xid);

logiterators.cpp

@@ -1,11 +1,6 @@
-
 #include "logstore.h"
-//#include "datapage.cpp"
 #include "logiterators.h"
 
-
- 
-
 //template <class MEMTREE, class TUPLE>
 /*
 template <>

logstore.cpp

@@ -1,20 +1,13 @@
-
-
-
 #include <string.h>
 #include <assert.h>
 #include <math.h>
 #include <ctype.h>
 
-
 #include "merger.h"
 #include "logstore.h"
 #include "logiterators.h"
-
-
 #include "datapage.cpp"
 
-
 #include <stasis/page/slotted.h>
 
 /////////////////////////////////////////////////////////////////

merger.cpp

@@ -2,7 +2,7 @@
 #include <math.h>
 #include "merger.h"
 #include "logiterators.cpp"
-#include "datapage.cpp"
+#include "datapage.h"
 //pageid_t merge_scheduler::C0_MEM_SIZE = 1000 * 1000 * 1000;
 
 //template <> struct merger_args<rbtree_t>;

server.cpp

@@ -3,8 +3,8 @@
 #include <iostream>
 #include <sstream>
 #include "logstore.h"
-#include "datapage.cpp"
+#include "datapage.h"
-#include "logiterators.cpp"
+#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>

test/check_datapage.cpp

@@ -3,7 +3,7 @@
 #include <iostream>
 #include <sstream>
 #include <logstore.h>
-#include <datapage.cpp> // XXX
+#include <datapage.h>
 
 #include <assert.h>
 #include <limits.h>

test/check_logtable.cpp

@@ -4,8 +4,8 @@
 #include <iostream>
 #include <sstream>
 #include "logstore.h"
-#include "datapage.cpp"
+#include "datapage.h"
-#include "logiterators.cpp"
+#include "logiterators.h"
 #include <assert.h>
 #include <limits.h>
 #include <math.h>

test/check_merge.cpp

@@ -3,8 +3,8 @@
 #include <iostream>
 #include <sstream>
 #include "logstore.h"
-#include "datapage.cpp"
+#include "datapage.h"
-#include "logiterators.cpp"
+#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>

test/check_mergelarge.cpp

@@ -3,8 +3,8 @@
 #include <iostream>
 #include <sstream>
 #include "logstore.h"
-#include "datapage.cpp"
+#include "datapage.h"
-#include "logiterators.cpp"
+#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>

test/check_mergetuple.cpp

@@ -3,8 +3,8 @@
 #include <iostream>
 #include <sstream>
 #include "logstore.h"
-#include "datapage.cpp"
+#include "datapage.h"
-#include "logiterators.cpp"
+#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>

test/check_rbtree.cpp

@@ -3,8 +3,8 @@
 #include <iostream>
 #include <sstream>
 #include "logstore.h"
-#include "datapage.cpp"
+#include "datapage.h"
-#include "logiterators.cpp"
+#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>