summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2020-12-17 14:26:46 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2020-12-17 14:26:46 +0100
commitdd9f398f1f139b7376ada18d8a71f0ce4d72082d (patch)
tree250491f6e4719787d41e97868ea1e88528678c4f /TAO
parent924369e56549553d522ee19dee6d0e41d991859c (diff)
parentdcf721afdb9d4ba5475abbd348526310fa3f135f (diff)
downloadATCD-dd9f398f1f139b7376ada18d8a71f0ce4d72082d.tar.gz
Merge branch 'master' into jwi-autoptr2
Diffstat (limited to 'TAO')
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventType.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
index 01d5a109d0b..fdca3733dba 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
@@ -86,7 +86,7 @@ public:
int done (void) const;
/// Dump the state of an object.
- void dump (void) const;
+ void dump () const;
// = STL styled iteration, compare, and reference functions.
@@ -174,7 +174,7 @@ public:
size_t size (void) const;
/// Dump the state of an object.
- void dump (void) const;
+ void dump () const;
/// Reset the <ACE_Unbounded_List> to be empty.
void reset (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
index b5a0f316f9f..ca5bed88301 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
@@ -67,7 +67,7 @@ public:
const CosNotification::EventType& native (void) const;
/// Helper to print contents.
- void dump (void) const;
+ void dump () const;
/// Initialize from an NVPList, return false on failure
bool init(const TAO_Notify::NVPList& attrs);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
index b011441347d..5ecbd009ffc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -64,7 +64,7 @@ public:
void populate_no_special (CosNotification::EventTypeSeq& event_type) const;
/// Print the contents.
- void dump (void) const;
+ void dump () const;
// TAO_Notify::Topology_Object