diff options
| -rw-r--r-- | ChangeLog-98b | 2 | ||||
| -rwxr-xr-x | bin/Hash_Map_Manager.pl | 4 | ||||
| -rwxr-xr-x | bin/Hash_Map_Manager_Helper | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index 957246b74cb..481f48786bc 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -97,9 +97,11 @@ Fri Dec 25 01:55:32 1998 Irfan Pyarali <irfan@cs.wustl.edu> TAO/examples/Callback_Quoter/Notifier_i.cpp TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp TAO/examples/Simple/bank/AccountManager_i.cpp + TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp + TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.cpp TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp TAO/orbsvcs/orbsvcs/Trader/Trader.cpp TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp diff --git a/bin/Hash_Map_Manager.pl b/bin/Hash_Map_Manager.pl index 6ba697d42b2..b8c16f394e8 100755 --- a/bin/Hash_Map_Manager.pl +++ b/bin/Hash_Map_Manager.pl @@ -99,14 +99,14 @@ while ($line = <>) sub find_match { $key = $_[0].'\s*<\s*(.*)>\s*'; - if ($line =~ /$template_instantiation $key$end_of_template_instantiation$/) + if ($line =~ /$template_instantiation \s*$key$end_of_template_instantiation$/) { $match = 1; $template_parameters = $1; $instantiation = $template_instantiation; $end_of_instantiation = $end_of_template_instantiation; } - elsif ($line =~ /$pragma_instantiation $key$end_of_pragma_instantiation$/) + elsif ($line =~ /$pragma_instantiation \s*$key$end_of_pragma_instantiation$/) { $match = 1; $template_parameters = $1; diff --git a/bin/Hash_Map_Manager_Helper b/bin/Hash_Map_Manager_Helper index a203ee3688e..d5e7b01cee2 100755 --- a/bin/Hash_Map_Manager_Helper +++ b/bin/Hash_Map_Manager_Helper @@ -68,8 +68,8 @@ # are using the template instantiation provided in ACE for ACE_Hash # and ACE_Equal_To, don't instantiate those templates. -foreach file ( `find . -type f \( -name "*.i" -o -name "*.h" -o -name "*.cpp" \) -print | xargs grep -l "template class ACE_Hash_Map_Entry"` ) +foreach file ( `find . -type f \( -name "*.i" -o -name "*.h" -o -name "*.cpp" \) -print | xargs grep -l "template class ACE_Hash_Map_Manager"` ) echo Fixing template instantiations in $file - perl $ACE_ROOT/bin/Hash_Map_Manager.perl $file > $file.new + perl $ACE_ROOT/bin/Hash_Map_Manager.pl $file > $file.new mv $file.new $file end |