diff options
| author | Huang-Ming Huang <huangh@ociweb.com> | 2016-09-22 14:31:36 -0500 |
|---|---|---|
| committer | Huang-Ming Huang <huangh@ociweb.com> | 2016-09-22 14:31:36 -0500 |
| commit | 9ef7b1dd9a1ac4181df901f81bd134b53884181b (patch) | |
| tree | f0e94e60371e9686d8c7787568266ae77bd9739c | |
| parent | 7a3126ae033cfab39c26ce38ad6112cf51e92f0d (diff) | |
| download | ATCD-9ef7b1dd9a1ac4181df901f81bd134b53884181b.tar.gz | |
Fix some fuzz errors
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/sfp.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/sfp.h | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h | 4 |
4 files changed, 3 insertions, 8 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 3290a0422df..ea7a4029ee1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -1151,6 +1151,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex); +ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex) ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 3d105ee5ea7..ad857ef4536 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -1321,8 +1321,6 @@ TAO_SFP_Frame_State::reset (void) return 0; } -//ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_SFP_Base, TAO_SYNCH_MUTEX); - TAO_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_SFP_Factory) diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index 6b68ed3bb97..a61fc453641 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -206,9 +206,6 @@ protected: // dumps the buffer to the screen. }; -// Beware the SFP_Base code relies on the Singleton being initialized. -// typedef ACE_Singleton <TAO_SFP_Base,TAO_SYNCH_MUTEX> TAO_SFP_BASE; - /** * @class TAO_SFP_Object * @brief diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h index 23cffbeebb4..878e956a536 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h @@ -75,8 +75,8 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_FTRTEC_SINGLETON_DECLARE(ACE_Singleton, GroupInfoPublisherBase, TAO_SYNCH_MUTEX) + +TAO_FTRTEC_SINGLETON_DECLARE(ACE_Singleton, GroupInfoPublisherBase, TAO_SYNCH_MUTEX) typedef ACE_Singleton<GroupInfoPublisherBase, TAO_SYNCH_MUTEX> GroupInfoPublisher; ACE_END_VERSIONED_NAMESPACE_DECL |