diff options
Diffstat (limited to 'ACE/ace/Filecache.cpp')
| -rw-r--r-- | ACE/ace/Filecache.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/ACE/ace/Filecache.cpp b/ACE/ace/Filecache.cpp index 6916367bc74..3f4644d57a7 100644 --- a/ACE/ace/Filecache.cpp +++ b/ACE/ace/Filecache.cpp @@ -43,13 +43,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Filecache *ACE_Filecache::cvf_ = 0; void -ACE_Filecache_Handle::init (void) +ACE_Filecache_Handle::init () { this->file_ = 0; this->handle_ = ACE_INVALID_HANDLE; } -ACE_Filecache_Handle::ACE_Filecache_Handle (void) +ACE_Filecache_Handle::ACE_Filecache_Handle () : file_ (0), handle_ (0) { this->init (); @@ -89,7 +89,7 @@ ACE_Filecache_Handle::ACE_Filecache_Handle (const ACE_TCHAR *filename, } } -ACE_Filecache_Handle::~ACE_Filecache_Handle (void) +ACE_Filecache_Handle::~ACE_Filecache_Handle () { if (this->handle_ != ACE_INVALID_HANDLE) // this was dup ()'d @@ -99,13 +99,13 @@ ACE_Filecache_Handle::~ACE_Filecache_Handle (void) } void * -ACE_Filecache_Handle::address (void) const +ACE_Filecache_Handle::address () const { return this->file_ == 0 ? 0 : this->file_->address (); } ACE_HANDLE -ACE_Filecache_Handle::handle (void) const +ACE_Filecache_Handle::handle () const { if (this->handle_ == ACE_INVALID_HANDLE && this->file_ != 0) { @@ -117,7 +117,7 @@ ACE_Filecache_Handle::handle (void) const } int -ACE_Filecache_Handle::error (void) const +ACE_Filecache_Handle::error () const { if (this->file_ == 0) return -1; @@ -126,7 +126,7 @@ ACE_Filecache_Handle::error (void) const } ACE_OFF_T -ACE_Filecache_Handle::size (void) const +ACE_Filecache_Handle::size () const { if (this->file_ == 0) return -1; @@ -169,7 +169,7 @@ ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (ACE_Filecache_Hash_Entry *next, } template <> -ACE_Filecache_Hash_Entry::~ACE_Hash_Map_Entry (void) +ACE_Filecache_Hash_Entry::~ACE_Hash_Map_Entry () { #if defined (ACE_HAS_ALLOC_HOOKS) ACE_Allocator::instance()->free ((void *) ext_id_); @@ -205,7 +205,7 @@ ACE_Filecache_Hash::equal (const ACE_TCHAR *const &id1, // ------------- ACE_Filecache * -ACE_Filecache::instance (void) +ACE_Filecache::instance () { // Double check locking pattern. if (ACE_Filecache::cvf_ == 0) @@ -226,13 +226,13 @@ ACE_Filecache::instance (void) return ACE_Filecache::cvf_; } -ACE_Filecache::ACE_Filecache (void) +ACE_Filecache::ACE_Filecache () : size_ (ACE_DEFAULT_VIRTUAL_FILESYSTEM_TABLE_SIZE), hash_ (size_) { } -ACE_Filecache::~ACE_Filecache (void) +ACE_Filecache::~ACE_Filecache () { } @@ -461,7 +461,7 @@ ACE_Filecache::finish (ACE_Filecache_Object *&file) } void -ACE_Filecache_Object::init (void) +ACE_Filecache_Object::init () { this->filename_[0] = '\0'; this->handle_ = ACE_INVALID_HANDLE; @@ -472,7 +472,7 @@ ACE_Filecache_Object::init (void) ACE_OS::memset (&(this->stat_), 0, sizeof (this->stat_)); } -ACE_Filecache_Object::ACE_Filecache_Object (void) +ACE_Filecache_Object::ACE_Filecache_Object () : tempname_ (0), mmap_ (), handle_ (0), @@ -612,7 +612,7 @@ ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename, // Ok, done! } -ACE_Filecache_Object::~ACE_Filecache_Object (void) +ACE_Filecache_Object::~ACE_Filecache_Object () { if (this->error_ == ACE_SUCCESS) { @@ -627,13 +627,13 @@ ACE_Filecache_Object::~ACE_Filecache_Object (void) ACE_ALLOC_HOOK_DEFINE(ACE_Filecache_Object) int -ACE_Filecache_Object::acquire (void) +ACE_Filecache_Object::acquire () { return this->lock_.tryacquire_read (); } int -ACE_Filecache_Object::release (void) +ACE_Filecache_Object::release () { if (this->action_ == ACE_WRITING) { @@ -688,7 +688,7 @@ ACE_Filecache_Object::release (void) } int -ACE_Filecache_Object::error (void) const +ACE_Filecache_Object::error () const { // The existence of the object means a read lock is being held. return this->error_; @@ -704,35 +704,35 @@ ACE_Filecache_Object::error_i (int error_value, const ACE_TCHAR *s) } const ACE_TCHAR * -ACE_Filecache_Object::filename (void) const +ACE_Filecache_Object::filename () const { // The existence of the object means a read lock is being held. return this->filename_; } ACE_OFF_T -ACE_Filecache_Object::size (void) const +ACE_Filecache_Object::size () const { // The existence of the object means a read lock is being held. return this->size_; } ACE_HANDLE -ACE_Filecache_Object::handle (void) const +ACE_Filecache_Object::handle () const { // The existence of the object means a read lock is being held. return this->handle_; } void * -ACE_Filecache_Object::address (void) const +ACE_Filecache_Object::address () const { // The existence of the object means a read lock is being held. return this->mmap_.addr (); } int -ACE_Filecache_Object::update (void) const +ACE_Filecache_Object::update () const { // The existence of the object means a read lock is being held. int result; |