upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-19 20:26:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add underscore to private members.

Browse Source
This commit is contained in:
Mark de Wever 2008-07-07 17:18:50 +00:00
parent 94bfed1da0
commit eaaf0b0bab
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/image.cpp
View File

@ -73,8 +73,8 @@ namespace image {
template<typename T>
void cache_type<T>::flush()
{
typename std::vector<cache_item<T> >::iterator beg = content.begin();
typename std::vector<cache_item<T> >::iterator end = content.end();
typename std::vector<cache_item<T> >::iterator beg = content_.begin();
typename std::vector<cache_item<T> >::iterator end = content_.end();
for(; beg != end; ++beg) {
beg->loaded = false;
@ -799,32 +799,32 @@ void precache_file_existence(const std::string& subdir)
template<typename T>
cache_item<T>& cache_type<T>::get_element(int index){
assert (index != -1);
while(index >= content.size()) {
content.push_back(cache_item<T>());
while(index >= content_.size()) {
content_.push_back(cache_item<T>());
}
cache_item<T>& elt = content[index];
cache_item<T>& elt = content_[index];
if(elt.loaded) {
assert(*elt.position == index);
lru_list.erase(elt.position);
lru_list.push_front(index);
elt.position = lru_list.begin();
lru_list_.erase(elt.position);
lru_list_.push_front(index);
elt.position = lru_list_.begin();
}
return elt;
}
template<typename T>
void cache_type<T>::on_load(int index){
if(index == -1) return ;
cache_item<T>& elt = content[index];
cache_item<T>& elt = content_[index];
if(!elt.loaded) return ;
lru_list.push_front(index);
cache_size++;
elt.position = lru_list.begin();
while(cache_size > cache_max_size-100) {
cache_item<T>& elt = content[lru_list.back()];
lru_list_.push_front(index);
cache_size_++;
elt.position = lru_list_.begin();
while(cache_size_ > cache_max_size_-100) {
cache_item<T>& elt = content_[lru_list_.back()];
elt.loaded=false;
elt.item = T();
lru_list.pop_back();
cache_size--;
lru_list_.pop_back();
cache_size_--;
}
}

16
src/image.hpp
View File

@ -67,10 +67,10 @@ namespace image {
{
public:
cache_type() :
cache_size(0),
cache_max_size(2000),
lru_list(),
content()
cache_size_(0),
cache_max_size_(2000),
lru_list_(),
content_()
{
}
@ -78,10 +78,10 @@ namespace image {
void on_load(int index);
void flush();
private:
int cache_size ;
int cache_max_size ;
std::list<int> lru_list;
std::vector<cache_item<T> > content;
int cache_size_;
int cache_max_size_;
std::list<int> lru_list_;
std::vector<cache_item<T> > content_;
};
//a generic image locator. Abstracts the location of an image.