greg/stasis-bLSM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removing the typename keyword to make declarations compile with gcc 4.1.2 after a bunch of types are no longer templates

Browse source 
git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@2672 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe
This commit is contained in:
surajach 2011-06-13 18:47:21 +00:00
parent d9e445df06
commit 5524b96bd9
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
datapage.cpp
View file

@ -323,7 +323,7 @@ bool DataPage::append(datatuple const * dat)
return succ; return succ;
} }
bool DataPage::recordRead(const typename datatuple::key_t key, size_t keySize, datatuple ** buf) bool DataPage::recordRead(const datatuple::key_t key, size_t keySize, datatuple ** buf)
{ {
iterator itr(this, NULL); iterator itr(this, NULL);

2
datapage.h
View file

@ -82,7 +82,7 @@ public:
} }
bool append(datatuple const * dat); bool append(datatuple const * dat);
bool recordRead(const typename datatuple::key_t key, size_t keySize, datatuple ** buf); bool recordRead(const datatuple::key_t key, size_t keySize, datatuple ** buf);
inline uint16_t recordCount(); inline uint16_t recordCount();

12
logstore.h
View file

@ -414,8 +414,8 @@ public:
logtable * ltable; logtable * ltable;
uint64_t epoch; uint64_t epoch;
typedef mergeManyIterator< typedef mergeManyIterator<
typename memTreeComponent::batchedRevalidatingIterator, memTreeComponent::batchedRevalidatingIterator,
typename memTreeComponent::iterator> inner_merge_it_t; memTreeComponent::iterator> inner_merge_it_t;
typedef mergeManyIterator< typedef mergeManyIterator<
inner_merge_it_t, inner_merge_it_t,
diskTreeComponent::iterator> merge_it_t; diskTreeComponent::iterator> merge_it_t;
@ -444,8 +444,8 @@ public:
void validate() { void validate() {
typename memTreeComponent::batchedRevalidatingIterator * c0_it; memTreeComponent::batchedRevalidatingIterator * c0_it;
typename memTreeComponent::iterator *c0_mergeable_it[1]; memTreeComponent::iterator *c0_mergeable_it[1];
diskTreeComponent::iterator * disk_it[4]; diskTreeComponent::iterator * disk_it[4];
epoch = ltable->get_epoch(); epoch = ltable->get_epoch();
@ -458,8 +458,8 @@ public:
t = NULL; t = NULL;
} }
c0_it = new typename memTreeComponent::batchedRevalidatingIterator(ltable->get_tree_c0(), 100, &ltable->rb_mut, t); c0_it = new memTreeComponent::batchedRevalidatingIterator(ltable->get_tree_c0(), 100, &ltable->rb_mut, t);
c0_mergeable_it[0] = new typename memTreeComponent::iterator (ltable->get_tree_c0_mergeable(), t); c0_mergeable_it[0] = new memTreeComponent::iterator (ltable->get_tree_c0_mergeable(), t);
if(ltable->get_tree_c1_prime()) { if(ltable->get_tree_c1_prime()) {
disk_it[0] = ltable->get_tree_c1_prime()->open_iterator(t); disk_it[0] = ltable->get_tree_c1_prime()->open_iterator(t);
} else { } else {

4
memTreeComponent.cpp
View file

@ -3,8 +3,8 @@
void memTreeComponent::tearDownTree(rbtree_ptr_t tree) { void memTreeComponent::tearDownTree(rbtree_ptr_t tree) {
datatuple * t = 0; datatuple * t = 0;
typename rbtree_t::iterator old; rbtree_t::iterator old;
for(typename rbtree_t::iterator delitr = tree->begin(); for(rbtree_t::iterator delitr = tree->begin();
delitr != tree->end(); delitr != tree->end();
delitr++) { delitr++) {
if(t) { if(t) {

6
memTreeComponent.h
View file

@ -20,7 +20,7 @@ public:
class iterator class iterator
{ {
private: private:
typedef typename rbtree_t::const_iterator MTITER; typedef rbtree_t::const_iterator MTITER;
public: public:
iterator( rbtree_t *s ) iterator( rbtree_t *s )
@ -84,7 +84,7 @@ public:
class revalidatingIterator class revalidatingIterator
{ {
private: private:
typedef typename rbtree_t::const_iterator MTITER; typedef rbtree_t::const_iterator MTITER;
public: public:
revalidatingIterator( rbtree_t *s, pthread_mutex_t * rb_mut ) : s_(s), mut_(rb_mut) { revalidatingIterator( rbtree_t *s, pthread_mutex_t * rb_mut ) : s_(s), mut_(rb_mut) {
@ -153,7 +153,7 @@ public:
class batchedRevalidatingIterator class batchedRevalidatingIterator
{ {
private: private:
typedef typename rbtree_t::const_iterator MTITER; typedef rbtree_t::const_iterator MTITER;
void populate_next_ret_impl(std::_Rb_tree_const_iterator<datatuple*>/*MTITER*/ it) { void populate_next_ret_impl(std::_Rb_tree_const_iterator<datatuple*>/*MTITER*/ it) {