diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2022-08-30 20:30:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 20:30:55 -0500 |
| commit | b118da99434468f430bbded9be4f292e02bad6ca (patch) | |
| tree | 0363f2097c0340151744c34fea0e46ab5b2091a2 | |
| parent | f05aac8547746f4c02d02d4785cd9bc97954a067 (diff) | |
| parent | 77afc7e68752f4483b99f9e7563f1ecfa3eac4d0 (diff) | |
| download | ATCD-b118da99434468f430bbded9be4f292e02bad6ca.tar.gz | |
Merge pull request #1915 from mitza-oci/tao2-ast-mutex
[TAO 2] Use ACE's Sync(h) traits in AST_Annotation_Appls
| -rw-r--r-- | TAO/TAO_IDL/include/ast_annotation_appls.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/TAO/TAO_IDL/include/ast_annotation_appls.h b/TAO/TAO_IDL/include/ast_annotation_appls.h index 0686717622e..20f5580edc3 100644 --- a/TAO/TAO_IDL/include/ast_annotation_appls.h +++ b/TAO/TAO_IDL/include/ast_annotation_appls.h @@ -1,9 +1,9 @@ #ifndef AST_ANNOTATION_APPL_VECTOR_HEADER #define AST_ANNOTATION_APPL_VECTOR_HEADER -#include "ace/Vector_T.h" -#include "ace/Mutex.h" #include "ace/Bound_Ptr.h" +#include "ace/Synch_Traits.h" +#include "ace/Vector_T.h" #include "TAO_IDL_FE_Export.h" @@ -17,7 +17,9 @@ class AST_Annotation_Decl; */ class TAO_IDL_FE_Export AST_Annotation_Appls { public: - typedef ACE_Strong_Bound_Ptr<AST_Annotation_Appl, ACE_Mutex> AST_Annotation_Appl_Ptr; +//FUZZ: disable check_for_ACE_SYNCH_MUTEX + typedef ACE_Strong_Bound_Ptr<AST_Annotation_Appl, ACE_SYNCH_MUTEX> AST_Annotation_Appl_Ptr; +//FUZZ: enable check_for_ACE_SYNCH_MUTEX typedef ACE_Vector<AST_Annotation_Appl_Ptr> AST_Annotation_Appl_Ptrs; typedef AST_Annotation_Appl_Ptrs::iterator iterator; typedef AST_Annotation_Appl_Ptrs::const_iterator const_iterator; @@ -43,7 +45,7 @@ public: bool empty () const; size_t size () const; - /// Iterate through ACE_Strong_Bound_Ptr<AST_Annotation_Appl, ACE_Mutex> + /// Iterate through vector_ ///{ iterator begin (); iterator end (); |