diff options
Diffstat (limited to 'ACE/apps/JAWS2/JAWS')
22 files changed, 80 insertions, 80 deletions
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp index 022553c65ba..a5349ab5bf1 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp @@ -224,7 +224,7 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::unbind (const EXT_ID &ext_id, template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> size_t -JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::size (void) const +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::size () const { return this->size_; } diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h index f80db70776d..501f20e1700 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h @@ -33,7 +33,7 @@ public: int unbind (const EXT_ID &ext_id); int unbind (const EXT_ID &ext_id, JAWS_Cache_Object *&int_id); - size_t size (void) const; + size_t size () const; protected: diff --git a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp index 99185b8280a..1aa8ce79a42 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.cpp @@ -54,25 +54,25 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_Heap (void) } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_empty (void) const +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_empty () const { return (this->size_ == 0); } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_full (void) const +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_full () const { return (this->size_ == this->maxsize_); } template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t -JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::size (void) const +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::size () const { return this->size_; } template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t -JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize (void) const +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize () const { return this->maxsize_; } diff --git a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h index 89f46561ace..7e80bbeb84e 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h @@ -29,11 +29,11 @@ public: ~JAWS_Cache_Heap (void); - int is_empty (void) const; - int is_full (void) const; + int is_empty () const; + int is_full () const; - size_t size (void) const; - size_t maxsize (void) const; + size_t size () const; + size_t maxsize () const; int maxsize (Cache_Manager *cm, size_t new_maxsize); // attempt to grow (or shrink) the heap. Return 0 on success, -1 on diff --git a/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp index aadbfaf550e..492152f6936 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_List_T.cpp @@ -27,25 +27,25 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_List (void) } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::is_empty (void) const +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::is_empty () const { return (this->size_ == 0); } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::is_full (void) const +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::is_full () const { return (this->size_ == this->maxsize_); } template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t -JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::size (void) const +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::size () const { return this->size_; } template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t -JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::maxsize (void) const +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::maxsize () const { return this->maxsize_; } diff --git a/ACE/apps/JAWS2/JAWS/Cache_List_T.h b/ACE/apps/JAWS2/JAWS/Cache_List_T.h index d7fee623365..d249db04cbf 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_List_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_List_T.h @@ -32,11 +32,11 @@ public: ~JAWS_Cache_List (void); - int is_empty (void) const; - int is_full (void) const; + int is_empty () const; + int is_full () const; - size_t size (void) const; - size_t maxsize (void) const; + size_t size () const; + size_t maxsize () const; int maxsize (Cache_Manager *cm, size_t new_maxsize); // attempt to grow (or shrink) the heap. Return 0 on success, -1 on diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp b/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp index 2bc6bc8835a..6c27bc4cc6c 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager.cpp @@ -10,7 +10,7 @@ JAWS_String_Hash_Functor::JAWS_String_Hash_Functor (const char *s) this->i_ = ACE::hash_pjw (s); } -JAWS_String_Hash_Functor::operator unsigned long (void) const +JAWS_String_Hash_Functor::operator unsigned long () const { return this->i_; } @@ -22,7 +22,7 @@ JAWS_String_Equal_Functor::JAWS_String_Equal_Functor (const char *s1, this->i_ = ACE_OS::strcmp (s1, s2); } -JAWS_String_Equal_Functor::operator int (void) const +JAWS_String_Equal_Functor::operator int () const { return this->i_ == 0; } @@ -60,7 +60,7 @@ JAWS_Strdup_String::~JAWS_Strdup_String (void) this->c_ = 0; } -JAWS_Strdup_String::operator const char * (void) const +JAWS_Strdup_String::operator const char * () const { return this->s_; } diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager.h b/ACE/apps/JAWS2/JAWS/Cache_Manager.h index af2c54ca3fb..5705521a6c9 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager.h @@ -10,7 +10,7 @@ class JAWS_String_Hash_Functor { public: JAWS_String_Hash_Functor (const char *s); - operator unsigned long (void) const; + operator unsigned long () const; private: unsigned long i_; @@ -20,7 +20,7 @@ class JAWS_String_Equal_Functor { public: JAWS_String_Equal_Functor (const char *s1, const char *s2); - operator int (void) const; + operator int () const; private: int i_; @@ -35,7 +35,7 @@ public: JAWS_Strdup_String (const JAWS_Strdup_String &s); ~JAWS_Strdup_String (void); - operator const char * (void) const; + operator const char * () const; void operator = (const char *s); void operator = (const JAWS_Strdup_String &s); diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp index fe9cabbedad..5dd377d766f 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp @@ -522,13 +522,13 @@ JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::~JAWS_Cache_Proxy (void) } template <class KEY, class DATA, class CACHE_MANAGER> DATA * -JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::data (void) const +JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::data () const { return this->object_ ? (DATA *) this->object_->data () : 0; } template <class KEY, class DATA, class CACHE_MANAGER> -JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::operator DATA * (void) const +JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::operator DATA * () const { return this->data (); } diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h index 9c8c1de7307..22dcbbd4d20 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h @@ -160,8 +160,8 @@ public: virtual ~JAWS_Cache_Proxy (void); - DATA *data (void) const; - operator DATA * (void) const; + DATA *data () const; + operator DATA * () const; virtual int close (DATA *); diff --git a/ACE/apps/JAWS2/JAWS/Cache_Object.cpp b/ACE/apps/JAWS2/JAWS/Cache_Object.cpp index b036842f65e..b024434f121 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Object.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Object.cpp @@ -20,7 +20,7 @@ JAWS_Cache_Object::~JAWS_Cache_Object () } void * -JAWS_Cache_Object::internal (void) const +JAWS_Cache_Object::internal () const { return this->internal_; } @@ -32,19 +32,19 @@ JAWS_Cache_Object::internal (void *item) } const void * -JAWS_Cache_Object::data (void) const +JAWS_Cache_Object::data () const { return this->data_; } size_t -JAWS_Cache_Object::size (void) const +JAWS_Cache_Object::size () const { return this->size_; } unsigned int -JAWS_Cache_Object::count (void) const +JAWS_Cache_Object::count () const { return this->count_i (); } @@ -64,25 +64,25 @@ JAWS_Cache_Object::release (void) } time_t -JAWS_Cache_Object::last_access (void) const +JAWS_Cache_Object::last_access () const { return this->last_access_; } time_t -JAWS_Cache_Object::first_access (void) const +JAWS_Cache_Object::first_access () const { return this->first_access_; } unsigned int -JAWS_Cache_Object::priority (void) const +JAWS_Cache_Object::priority () const { return this->priority_i (); } void * -JAWS_Cache_Object::heap_item (void) const +JAWS_Cache_Object::heap_item () const { return this->heap_item_; } @@ -112,7 +112,7 @@ JAWS_Referenced_Cache_Object::lock (void) } unsigned int -JAWS_Referenced_Cache_Object::count_i (void) const +JAWS_Referenced_Cache_Object::count_i () const { if (this->count_.tryacquire_write () == 0) return 0; @@ -133,7 +133,7 @@ JAWS_Referenced_Cache_Object::release_i (void) } unsigned int -JAWS_Referenced_Cache_Object::priority_i (void) const +JAWS_Referenced_Cache_Object::priority_i () const { unsigned int priority = ~(0U); double delta @@ -167,7 +167,7 @@ JAWS_Counted_Cache_Object::lock (void) } unsigned int -JAWS_Counted_Cache_Object::count_i (void) const +JAWS_Counted_Cache_Object::count_i () const { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g ,this->lock_, 0); @@ -194,7 +194,7 @@ JAWS_Counted_Cache_Object::release_i (void) } unsigned int -JAWS_Counted_Cache_Object::priority_i (void) const +JAWS_Counted_Cache_Object::priority_i () const { return this->count_i (); } diff --git a/ACE/apps/JAWS2/JAWS/Cache_Object.h b/ACE/apps/JAWS2/JAWS/Cache_Object.h index 19c717f336e..3c92bdbb0bf 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Object.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Object.h @@ -23,34 +23,34 @@ public: JAWS_Cache_Object (const void *, size_t); virtual ~JAWS_Cache_Object (void); - void *internal (void) const; + void *internal () const; void internal (void *); - const void *data (void) const; - size_t size (void) const; - unsigned int count (void) const; + const void *data () const; + size_t size () const; + unsigned int count () const; int acquire (void); int release (void); - time_t last_access (void) const; - time_t first_access (void) const; + time_t last_access () const; + time_t first_access () const; - unsigned int priority (void) const; + unsigned int priority () const; enum { ACE_CO_REFERENCED, ACE_CO_COUNTED }; - void *heap_item (void) const; + void *heap_item () const; void heap_item (void *item); virtual ACE_Lock & lock (void) = 0; protected: - virtual unsigned int count_i (void) const = 0; + virtual unsigned int count_i () const = 0; virtual int acquire_i (void) = 0; virtual int release_i (void) = 0; - virtual unsigned int priority_i (void) const = 0; + virtual unsigned int priority_i () const = 0; private: @@ -76,10 +76,10 @@ public: protected: - virtual unsigned int count_i (void) const; + virtual unsigned int count_i () const; virtual int acquire_i (void); virtual int release_i (void); - virtual unsigned int priority_i (void) const; + virtual unsigned int priority_i () const; private: @@ -98,10 +98,10 @@ public: protected: - virtual unsigned int count_i (void) const; + virtual unsigned int count_i () const; virtual int acquire_i (void); virtual int release_i (void); - virtual unsigned int priority_i (void) const; + virtual unsigned int priority_i () const; private: diff --git a/ACE/apps/JAWS2/JAWS/FILE.cpp b/ACE/apps/JAWS2/JAWS/FILE.cpp index f731cb2a956..2667ed4f2f6 100644 --- a/ACE/apps/JAWS2/JAWS/FILE.cpp +++ b/ACE/apps/JAWS2/JAWS/FILE.cpp @@ -65,7 +65,7 @@ JAWS_FILE::mem_map (int length, ACE_Mem_Map * -JAWS_FILE::map (void) const +JAWS_FILE::map () const { return this->map_; } diff --git a/ACE/apps/JAWS2/JAWS/FILE.h b/ACE/apps/JAWS2/JAWS/FILE.h index 3ab96227ad7..b06b3e7ef2c 100644 --- a/ACE/apps/JAWS2/JAWS/FILE.h +++ b/ACE/apps/JAWS2/JAWS/FILE.h @@ -33,7 +33,7 @@ public: ACE_OFF_T offset = 0, LPSECURITY_ATTRIBUTES sa = 0) const; - ACE_Mem_Map *map (void) const; + ACE_Mem_Map *map () const; private: diff --git a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp index 097f932b0c3..0a5ca46367f 100644 --- a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.cpp @@ -60,7 +60,7 @@ JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>:: template <class EXT_ID, class INT_ID> int JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>:: -is_empty (void) const +is_empty () const { return this->head_ == 0 && this->tail_ == 0; } @@ -288,7 +288,7 @@ prev (JAWS_HASH_BUCKET_ITEM *&item) const } template <class EXT_ID, class INT_ID> int -JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::done (void) const +JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::done () const { return this->done_; } diff --git a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h index 670834267fe..16ef1b45200 100644 --- a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h +++ b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h @@ -64,7 +64,7 @@ public: JAWS_Hash_Bucket_DLCStack (ACE_Allocator *alloc = 0); ~JAWS_Hash_Bucket_DLCStack (void); - int is_empty (void) const; + int is_empty () const; // Returns 1 if the container is empty, otherwise returns 0. JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *push (const EXT_ID &ext_id, @@ -131,7 +131,7 @@ public: // Pass back the previous item. Returns 0 if done is true, 1 // otherwise. - int done (void) const; + int done () const; // Returns 1 if done_ flag is set, 0 otherwise. done_ flag is set // if next takes us to first element or prev takes us to last // element. diff --git a/ACE/apps/JAWS2/JAWS/Headers.cpp b/ACE/apps/JAWS2/JAWS/Headers.cpp index ca36aa11f31..f536db5b0bf 100644 --- a/ACE/apps/JAWS2/JAWS/Headers.cpp +++ b/ACE/apps/JAWS2/JAWS/Headers.cpp @@ -32,19 +32,19 @@ JAWS_Header_Data::~JAWS_Header_Data (void) } const char * -JAWS_Header_Data::header_name (void) const +JAWS_Header_Data::header_name () const { return this->header_name_; } const char * -JAWS_Header_Data::header_value (void) const +JAWS_Header_Data::header_value () const { return this->header_value_; } int -JAWS_Header_Data::header_type (void) const +JAWS_Header_Data::header_type () const { return this->header_type_; } diff --git a/ACE/apps/JAWS2/JAWS/Headers.h b/ACE/apps/JAWS2/JAWS/Headers.h index 54d4ede3231..889bc2e2a70 100644 --- a/ACE/apps/JAWS2/JAWS/Headers.h +++ b/ACE/apps/JAWS2/JAWS/Headers.h @@ -29,9 +29,9 @@ public: JAWS_Header_Data (const char *name, int type, const char *value = 0); ~JAWS_Header_Data (void); - const char * header_name (void) const; - const char * header_value (void) const; - int header_type (void) const; + const char * header_name () const; + const char * header_value () const; + int header_type () const; void header_name (const char *name); void header_value (const char *value); diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp index 0d2207d83d0..98eb420d4e7 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp +++ b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp @@ -166,7 +166,7 @@ JAWS_IO_Handler::factory (void) } ACE_HANDLE -JAWS_IO_Handler::handle (void) const +JAWS_IO_Handler::handle () const { return this->handle_; } @@ -354,7 +354,7 @@ JAWS_Asynch_Handler::act (const void *act_ref) #if 0 ACE_HANDLE -JAWS_Asynch_Handler::handle (void) const +JAWS_Asynch_Handler::handle () const { return this->ioh_->handle (); } diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.h b/ACE/apps/JAWS2/JAWS/IO_Handler.h index e7ea5383746..9d23baa2205 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Handler.h +++ b/ACE/apps/JAWS2/JAWS/IO_Handler.h @@ -111,7 +111,7 @@ public: virtual JAWS_IO_Handler_Factory *factory (void) = 0; /// Returns the socket handle for this handler - virtual ACE_HANDLE handle (void) const = 0; + virtual ACE_HANDLE handle () const = 0; /// Cleans up the handler. virtual void done (void) = 0; @@ -177,7 +177,7 @@ public: /// Receives the ACT. virtual void act (const void *act_ref); - //virtual ACE_HANDLE handle (void) const; + //virtual ACE_HANDLE handle () const; private: JAWS_Asynch_IO_Handler *ioh_; @@ -206,7 +206,7 @@ public: virtual void error_message_complete (void); virtual JAWS_IO_Handler_Factory *factory (void); - virtual ACE_HANDLE handle (void) const; + virtual ACE_HANDLE handle () const; virtual void done (void); virtual int status (void); diff --git a/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp b/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp index cc3ac3f120d..63b00475404 100644 --- a/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp +++ b/ACE/apps/JAWS2/JAWS/Parse_Headers.cpp @@ -3,7 +3,7 @@ #include "ace/Log_Msg.h" #define ACCESSOR(T,C,x) \ -T C :: x (void) const { return this-> x##_; }\ +T C :: x () const { return this-> x##_; }\ void C :: x (T t) { this-> x##_ = t; } int @@ -418,13 +418,13 @@ JAWS_Header_Info::header_buf (void) } const char * -JAWS_Header_Info::last_header_name (void) const +JAWS_Header_Info::last_header_name () const { return this->last_header_data_ ? this->last_header_data_->header_name () : 0; } const JAWS_Header_Data * -JAWS_Header_Info::last_header_data (void) const +JAWS_Header_Info::last_header_data () const { return this->last_header_data_; } diff --git a/ACE/apps/JAWS2/JAWS/Parse_Headers.h b/ACE/apps/JAWS2/JAWS/Parse_Headers.h index 6aefd116307..e2cddf11460 100644 --- a/ACE/apps/JAWS2/JAWS/Parse_Headers.h +++ b/ACE/apps/JAWS2/JAWS/Parse_Headers.h @@ -20,15 +20,15 @@ public: JAWS_Header_Info (void); ~JAWS_Header_Info (void); - int end_of_line (void) const; + int end_of_line () const; void end_of_line (int flag); - const char *last_header_name (void) const; + const char *last_header_name () const; - int last_header_length (void) const; + int last_header_length () const; void last_header_length (int len); - const JAWS_Header_Data * last_header_data (void) const; + const JAWS_Header_Data * last_header_data () const; char *header_buf (void); @@ -46,10 +46,10 @@ public: // This will insert last_header_data into the table if it is not // null. - int end_of_headers (void) const; + int end_of_headers () const; void end_of_headers (int flag); - int status (void) const; + int status () const; void status (int s); JAWS_Headers *table (void); |