diff options
| -rw-r--r-- | ChangeLog-96b | 12 | ||||
| -rw-r--r-- | ace/CORBA_Handler.h | 4 | ||||
| -rw-r--r-- | ace/Module.cpp | 6 | ||||
| -rw-r--r-- | ace/Stream.cpp | 7 | ||||
| -rw-r--r-- | ace/Svc_Conf_y.cpp | 12 | ||||
| -rw-r--r-- | ace/Svc_Handler.cpp | 2 | ||||
| -rw-r--r-- | ace/Synch_T.cpp | 25 | ||||
| -rw-r--r-- | ace/Synch_T.i | 26 | ||||
| -rw-r--r-- | ace/Task_T.cpp | 2 | ||||
| -rw-r--r-- | ace/Token_Collection.cpp | 4 | ||||
| -rw-r--r-- | ace/Token_Collection.h | 4 |
11 files changed, 59 insertions, 45 deletions
diff --git a/ChangeLog-96b b/ChangeLog-96b index e1af406e356..790f4fd5170 100644 --- a/ChangeLog-96b +++ b/ChangeLog-96b @@ -1,3 +1,15 @@ +Sat Dec 14 11:39:15 1996 David L. Levine <levine@cs.wustl.edu> + + * ace/{Module,Stream,Svc_Handler,Synch_T,Task_T}.cpp and Synch_T.i: + removed ACE_INLINE qualifier from functions in .cpp files; in + the case of Synch_T, moved ACE_INLINE functions from .cpp to .i file + + * ace/CORBA_Handler.h and ace/Token_Collection.{h,cpp}: + changed __INLINE__ to __ACE_INLINE__ + + * ace/Svc_Conf_y.cpp: commented out unused arguments to + suppress compiler complaints + Fri Dec 13 22:07:11 1996 David L. Levine <levine@cs.wustl.edu> * include/makeinclude/platform_sunos5_sunc++*.GNU: replaced diff --git a/ace/CORBA_Handler.h b/ace/CORBA_Handler.h index d6d15656563..655d159c255 100644 --- a/ace/CORBA_Handler.h +++ b/ace/CORBA_Handler.h @@ -230,9 +230,9 @@ protected: }; #endif /* ACE_HAS_MT_ORBIX */ -#if defined (__INLINE__) +#if defined (__ACE_INLINE__) #include "ace/CORBA_Handler.i" -#endif /* __INLINE__ */ +#endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_ORBIX */ #endif /* ACE_CORBA_HANDLER_H */ diff --git a/ace/Module.cpp b/ace/Module.cpp index 90fe094ce9c..d38df5b7a7f 100644 --- a/ace/Module.cpp +++ b/ace/Module.cpp @@ -138,7 +138,7 @@ ACE_Module<ACE_SYNCH_2>::sibling (ACE_Task<ACE_SYNCH_2> *orig) return 0; } -template <ACE_SYNCH_1> ACE_INLINE +template <ACE_SYNCH_1> ACE_Module<ACE_SYNCH_2>::ACE_Module (void) { ACE_TRACE ("ACE_Module<ACE_SYNCH_2>::ACE_Module"); @@ -148,7 +148,7 @@ ACE_Module<ACE_SYNCH_2>::ACE_Module (void) this->q_pair_[1] = 0; } -template <ACE_SYNCH_1> ACE_INLINE +template <ACE_SYNCH_1> ACE_Module<ACE_SYNCH_2>::~ACE_Module (void) { ACE_TRACE ("ACE_Module<ACE_SYNCH_2>::~ACE_Module"); @@ -158,7 +158,7 @@ ACE_Module<ACE_SYNCH_2>::~ACE_Module (void) this->close (); } -template <ACE_SYNCH_1> ACE_INLINE +template <ACE_SYNCH_1> ACE_Module<ACE_SYNCH_2>::ACE_Module (const char *mod_name, ACE_Task<ACE_SYNCH_2> *writer_q, ACE_Task<ACE_SYNCH_2> *reader_q, diff --git a/ace/Stream.cpp b/ace/Stream.cpp index f65a29a4a41..ab75f3b73d9 100644 --- a/ace/Stream.cpp +++ b/ace/Stream.cpp @@ -471,7 +471,7 @@ ACE_Stream<ACE_SYNCH_2>::unlink (void) return this->unlink_i (); } -template <ACE_SYNCH_1> ACE_INLINE +template <ACE_SYNCH_1> ACE_Stream<ACE_SYNCH_2>::ACE_Stream (void * a, ACE_Module<ACE_SYNCH_2> *head, ACE_Module<ACE_SYNCH_2> *tail) @@ -485,7 +485,6 @@ ACE_Stream<ACE_SYNCH_2>::ACE_Stream (void * a, } #if 0 -ACE_INLINE ACE_Stream<ACE_SYNCH_2>::ACE_Stream (void *a, ACE_Multiplexor &muxer, ACE_Module<ACE_SYNCH_2> *head) @@ -499,7 +498,7 @@ ACE_Stream<ACE_SYNCH_2>::ACE_Stream (void *a, } #endif -template <ACE_SYNCH_1> ACE_INLINE +template <ACE_SYNCH_1> ACE_Stream<ACE_SYNCH_2>::~ACE_Stream (void) { ACE_TRACE ("ACE_Stream<ACE_SYNCH_2>::~ACE_Stream"); @@ -508,7 +507,7 @@ ACE_Stream<ACE_SYNCH_2>::~ACE_Stream (void) this->close (); } -template <ACE_SYNCH_1> ACE_INLINE +template <ACE_SYNCH_1> ACE_Stream_Iterator<ACE_SYNCH_2>::ACE_Stream_Iterator (const ACE_Stream<ACE_SYNCH_2> &sr) : next_ (sr.stream_head_) { diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp index 8c15cc567ba..fbe8477c6ba 100644 --- a/ace/Svc_Conf_y.cpp +++ b/ace/Svc_Conf_y.cpp @@ -370,7 +370,7 @@ int ace_yyindent; #endif /* YYDEBUG_INDENT */ #ifndef YYDEBUG_REDUCE #ifdef __cplusplus -void YYDEBUG_REDUCE(int ace_yynew_state, int ace_yyrule_num, char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count) +void YYDEBUG_REDUCE(int /* ace_yynew_state */, int /* ace_yyrule_num */, char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count) #else YYDEBUG_REDUCE(ace_yynew_state, ace_yyrule_num, ace_yyrule_string, ace_yynew_indent, ace_yyrhs_count) int ace_yynew_state; @@ -400,7 +400,7 @@ int ace_yyrhs_count; #endif /* YYDEBUG_REDUCE */ #ifndef YYDEBUG_SHIFT_LEXEME #ifdef __cplusplus -void YYDEBUG_SHIFT_LEXEME(int ace_yyold_state, int ace_yynew_state, char *ace_yytoken_string, int ace_yynew_indent) +void YYDEBUG_SHIFT_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state */, char *ace_yytoken_string, int ace_yynew_indent) #else YYDEBUG_SHIFT_LEXEME(ace_yyold_state, ace_yynew_state, ace_yytoken_string, ace_yynew_indent) int ace_yyold_state; @@ -415,7 +415,7 @@ int ace_yynew_indent; #endif /* YYDEBUG_SHIFT_LEXEME */ #ifndef YYDEBUG_LOOK_AHEAD #ifdef __cplusplus -void YYDEBUG_LOOK_AHEAD(int ace_yynew_state, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent) +void YYDEBUG_LOOK_AHEAD(int /* ace_yynew_state */, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent) #else YYDEBUG_LOOK_AHEAD(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent) int ace_yynew_state; @@ -432,7 +432,7 @@ int ace_yyindent; #endif /* YYDEBUG_LOOK_AHEAD */ #ifndef YYDEBUG_DISCARD_STATE #ifdef __cplusplus -void YYDEBUG_DISCARD_STATE(int ace_yynew_state, int ace_yyindent) +void YYDEBUG_DISCARD_STATE(int /* ace_yynew_state */, int ace_yyindent) #else YYDEBUG_DISCARD_STATE(ace_yynew_state, ace_yyindent) int ace_yynew_state; @@ -460,7 +460,7 @@ int ace_yyindent; #endif /* YYDEBUG_DISCARD_STATE */ #ifndef YYDEBUG_DISCARD_TOKEN #ifdef __cplusplus -void YYDEBUG_DISCARD_TOKEN(int ace_yynew_state, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent) +void YYDEBUG_DISCARD_TOKEN(int /* ace_yynew_state */, int /* ace_yytoken_num */, char *ace_yytoken_string, int ace_yyindent) #else YYDEBUG_DISCARD_TOKEN(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent) int ace_yynew_state; @@ -475,7 +475,7 @@ int ace_yyindent; #endif /* YYDEBUG_DISCARD_TOKEN */ #ifndef YYDEBUG_SHIFT_ERROR_LEXEME #ifdef __cplusplus -void YYDEBUG_SHIFT_ERROR_LEXEME(int ace_yyold_state, int ace_yynew_state, int ace_yyindent) +void YYDEBUG_SHIFT_ERROR_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state */, int ace_yyindent) #else YYDEBUG_SHIFT_ERROR_LEXEME(ace_yyold_state, ace_yynew_state, ace_yyindent) int ace_yyold_state; diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp index 39aff9dbf80..4285901216f 100644 --- a/ace/Svc_Handler.cpp +++ b/ace/Svc_Handler.cpp @@ -160,7 +160,7 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_2>::dump (void) const ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_2>::dump"); } -template <PR_ST_1, ACE_SYNCH_1> ACE_INLINE ACE_PEER_STREAM & +template <PR_ST_1, ACE_SYNCH_1> ACE_PEER_STREAM & ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_2>::peer (void) const { ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_2>::peer"); diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp index cf6219502eb..4357c9702a3 100644 --- a/ace/Synch_T.cpp +++ b/ace/Synch_T.cpp @@ -245,30 +245,7 @@ ACE_TSS<TYPE>::dump (void) const #endif /* defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) */ } -#if !(defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)) -template <class TYPE> ACE_INLINE -ACE_TSS<TYPE>::ACE_TSS (TYPE *) -{ -} - -template <class TYPE> ACE_INLINE TYPE * -ACE_TSS<TYPE>::ts_object (void) const -{ - return (TYPE *) &this->type_; -} - -template <class TYPE> ACE_INLINE TYPE * -ACE_TSS<TYPE>::ts_object (TYPE *) -{ - return &this->type_; -} - -template <class TYPE> ACE_INLINE TYPE * -ACE_TSS<TYPE>::ts_get (void) const -{ - return (TYPE *) &this->type_; -} -#else +#if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) template <class TYPE> ACE_TSS<TYPE>::ACE_TSS (TYPE *ts_obj) : once_ (0), diff --git a/ace/Synch_T.i b/ace/Synch_T.i index cdc6646d889..198975ee38a 100644 --- a/ace/Synch_T.i +++ b/ace/Synch_T.i @@ -172,5 +172,31 @@ ACE_Condition<MUTEX>::broadcast (void) // ACE_TRACE ("ACE_Condition<MUTEX>::broadcast"); return ACE_OS::cond_broadcast (&this->cond_); } + #endif /* ACE_HAS_THREADS */ +#if !(defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)) +template <class TYPE> ACE_INLINE +ACE_TSS<TYPE>::ACE_TSS (TYPE *) +{ +} + +template <class TYPE> ACE_INLINE TYPE * +ACE_TSS<TYPE>::ts_object (void) const +{ + return (TYPE *) &this->type_; +} + +template <class TYPE> ACE_INLINE TYPE * +ACE_TSS<TYPE>::ts_object (TYPE *) +{ + return &this->type_; +} + +template <class TYPE> ACE_INLINE TYPE * +ACE_TSS<TYPE>::ts_get (void) const +{ + return (TYPE *) &this->type_; +} + +#endif /* defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) */ diff --git a/ace/Task_T.cpp b/ace/Task_T.cpp index a31045142a6..489ec46371b 100644 --- a/ace/Task_T.cpp +++ b/ace/Task_T.cpp @@ -13,7 +13,7 @@ #include "ace/Task_T.i" #endif /* __ACE_INLINE__ */ -template <ACE_SYNCH_1> ACE_INLINE void +template <ACE_SYNCH_1> void ACE_Task<ACE_SYNCH_2>::dump (void) const { ACE_TRACE ("ACE_Task<ACE_SYNCH_2>::dump"); diff --git a/ace/Token_Collection.cpp b/ace/Token_Collection.cpp index 1cc1e433a18..ac349124673 100644 --- a/ace/Token_Collection.cpp +++ b/ace/Token_Collection.cpp @@ -5,9 +5,9 @@ #define ACE_BUILD_DLL #include "ace/Token_Collection.h" -#if !defined (__INLINE__) +#if !defined (__ACE_INLINE__) #include "ace/Token_Collection.i" -#endif /* __INLINE__ */ +#endif /* __ACE_INLINE__ */ ACE_Token_Collection::ACE_Token_Collection (int debug, const char *name) diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h index c31147c927e..f9b8e48e084 100644 --- a/ace/Token_Collection.h +++ b/ace/Token_Collection.h @@ -209,8 +209,8 @@ protected: virtual ACE_Tokens *create_token (const char *name); }; -#if defined (__INLINE__) +#if defined (__ACE_INLINE__) #include "ace/Token_Collection.i" -#endif /* __INLINE__ */ +#endif /* __ACE_INLINE__ */ #endif /* ACE_TOKEN_COLLECTION_H */ |