diff options
author | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-12-04 15:42:36 +0000 |
---|---|---|
committer | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-12-04 15:42:36 +0000 |
commit | 5ecfc2bd74fce6a0764baceaeeccfa998651cd9c (patch) | |
tree | dbe912975c795f36e510610efda9c4da894e7393 /TAO | |
parent | 6584ae6d1ee65c3c5cfeec40b80b70c18f26b6cf (diff) | |
download | ATCD-5ecfc2bd74fce6a0764baceaeeccfa998651cd9c.tar.gz |
Tue Dec 4 15:41:37 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLog | 9 | ||||
-rw-r--r-- | TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h | 2 | ||||
-rw-r--r-- | TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h | 5 | ||||
-rw-r--r-- | TAO/orbsvcs/PSS/PSDL_Scope.cpp | 2 |
4 files changed, 15 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3c9c18dee26..c37d0a6de03 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Tue Dec 4 15:41:37 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> + + * docs/tutorials/Quoter/RTCORBA/Distributor_i.h: + * docs/tutorials/Quoter/RTCORBA/Stock_Database.h: + * orbsvcs/PSS/PSDL_Scope.cpp: + + Replaced ACE_Thread_Mutex with TAO_SYNCH_MUTEX to comply with TAO + coding standards and to silence fuzz warnings. + Tue Dec 4 14:54:02 UTC 2007 Adam Mitz <mitza@ociweb.com> * tests/Bug_2234_Regression/Test.idl: diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h index e7ecf716956..888727905b6 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h @@ -199,7 +199,7 @@ private: // Define typedefs for our version of the stock database. -typedef ACE_Singleton<Stock_Database<StockDistributor_i>, ACE_Thread_Mutex> Stock_Database_Singleton; +typedef ACE_Singleton<Stock_Database<StockDistributor_i>, TAO_SYNCH_MUTEX> Stock_Database_Singleton; #define STOCK_DATABASE Stock_Database_Singleton::instance() #endif /* DISTRIBUTORI_H_ */ diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h index 8e3e874fe6f..1b9aaa75273 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h @@ -13,6 +13,9 @@ // ACE headers #include "ace/Task.h" +// TAO headrs +// #include "tao/orbconf.h" + // STL headers #include <map> #include <string> @@ -132,7 +135,7 @@ private: #include "Stock_Database.tpp" -//typedef ACE_Singleton<Stock_Database, ACE_Thread_Mutex> Stock_Database_Singleton; +//typedef ACE_Singleton<Stock_Database, TAO_SYNCH_MUTEX> Stock_Database_Singleton; //#define STOCK_DATABASE Stock_Database_Singleton::instance() #endif // !defined STOCK_DATABASE_H_ diff --git a/TAO/orbsvcs/PSS/PSDL_Scope.cpp b/TAO/orbsvcs/PSS/PSDL_Scope.cpp index 13829c524af..e00f61e8f0b 100644 --- a/TAO/orbsvcs/PSS/PSDL_Scope.cpp +++ b/TAO/orbsvcs/PSS/PSDL_Scope.cpp @@ -924,5 +924,5 @@ TAO_PSDL_Scope::scope_map (void) } #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template TAO_Singleton<TAO_PSDL_Scope, ACE_Thread_Mutex> *TAO_Singleton<TAO_PSDL_Scope, ACE_Thread_Mutex>::singleton_; +template TAO_Singleton<TAO_PSDL_Scope, TAO_SYNCH_MUTEX> *TAO_Singleton<TAO_PSDL_Scope, TAO_SYNCH_MUTEX>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ |