diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-08-07 19:16:08 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2009-08-07 19:16:08 +0000 |
| commit | 807150920c328dab784c8bd7891fd120a279a8c0 (patch) | |
| tree | 23e5807eea1aa38d1f455837f532d27328a71991 | |
| parent | 7d1756da2d7a2e1644c920f3332961e9d468cf50 (diff) | |
| download | ATCD-807150920c328dab784c8bd7891fd120a279a8c0.tar.gz | |
Fri Aug 7 19:15:30 UTC 2009 William R. Otte <Wotte@dre.vanderbilt.edu>
| -rw-r--r-- | modules/CIAO/ChangeLog | 12 | ||||
| -rw-r--r-- | modules/CIAO/tools/Config_Handlers/XMLSchema/id_map.hpp | 9 |
2 files changed, 15 insertions, 6 deletions
diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog index e30cd6152f4..4c95b0f8cc2 100644 --- a/modules/CIAO/ChangeLog +++ b/modules/CIAO/ChangeLog @@ -1,14 +1,20 @@ +Fri Aug 7 19:15:30 UTC 2009 William R. Otte <Wotte@dre.vanderbilt.edu> + + * tools/Config_Handlers/XMLSchema/id_map.hpp: + + Compile fixes for sun studio 12. + Fri Aug 7 14:21:34 UTC 2009 William R. Otte <Wotte@dre.vanderbilt.edu> * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp: * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp: * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - 5_to_5 behavior. This deploys the senders/receivers as part of + 5_to_5 behavior. This deploys the senders/receivers as part of separate plans. It seems that the delayed servant activation may be causing problems with discovery, leaving the receivers recieving less - than 50 messages each. - + than 50 messages each. + Fri Aug 7 14:00:45 UTC 2009 William R. Otte <Wotte@dre.vanderbilt.edu> * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl: diff --git a/modules/CIAO/tools/Config_Handlers/XMLSchema/id_map.hpp b/modules/CIAO/tools/Config_Handlers/XMLSchema/id_map.hpp index 2a90c23857c..8f7899cdc66 100644 --- a/modules/CIAO/tools/Config_Handlers/XMLSchema/id_map.hpp +++ b/modules/CIAO/tools/Config_Handlers/XMLSchema/id_map.hpp @@ -39,6 +39,9 @@ */ class ID_Map { + typedef std::map<XMLSchema::ID<ACE_TCHAR>, XSCRT::Type*> ID_MAP; + typedef std::multimap<XMLSchema::NCName<ACE_TCHAR>, XSCRT::Type*> IDREF_MAP; + public: //Trait to allow for ease of thread specific storage. @@ -86,7 +89,7 @@ if (obj_ref) { //this->idref_map_[idref] = obj_ref; - this->idref_map_.insert(std::pair<XMLSchema::NCName<ACE_TCHAR>, XSCRT::Type*>(idref, obj_ref)); + this->idref_map_.insert(IDREF_MAP::value_type (idref, obj_ref)); } else { @@ -127,8 +130,8 @@ // ID attribute //idref_map_: multimap that maps the IDREF string to the // element with the IDREF attribute - std::map<XMLSchema::ID<ACE_TCHAR>, XSCRT::Type*> id_map_; - std::multimap<XMLSchema::NCName<ACE_TCHAR>, XSCRT::Type*> idref_map_; + ID_MAP id_map_; + IDREF_MAP idref_map_; }; #endif /* _ID_MAP_HPP */ |