diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-02-21 19:25:26 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-02-21 19:25:26 +0000 |
| commit | 8a88fd318d63dda7430573e5c516bc13712ec687 (patch) | |
| tree | 7b39b1080eac61fd2498b19505ea37495822a054 | |
| parent | 23a9b61d168a8a0ecdcc2aa78cc114f1bc44c545 (diff) | |
| download | ATCD-8a88fd318d63dda7430573e5c516bc13712ec687.tar.gz | |
ChangelogTag: Tue Feb 21 19:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 4 | ||||
| -rw-r--r-- | bin/tao_other_tests.lst | 2 | ||||
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 4 |
5 files changed, 14 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 240e13b0518..7c441a1390d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Feb 21 19:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.{h,cpp}: + * tao/AnyTypeCode_Adapter.h: + Added insert_into_any methods for all basic types. Thanks to + Nemoy Michael <michaeln at sintecmedia dot com> for providing + the patches. This also fixes bugzilla bugs 2371 and 2367 + Tue Feb 21 17:48:24 UTC 2006 Simon McQueen <sm@prismtech.com> * tao/Adapter.h: @@ -2069,6 +2069,7 @@ Karl Schmitt <Karl dot Schmitt at dfs dot de> Ron DeAngelis <rdeangel at rite-solutions dot com> Alex Sheh <ASHEH at euphonix dot com> Daniel Wagner <__daniel___ at icg do tu-graz dot ac dot at> +Nemoy Michael <michaeln at sintecmedia dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 0bd0277d3d2..c4886222753 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -607,7 +607,9 @@ endif ifneq ($(VXWORKSLINK),true) <%if(libs && libpaths)%> ifeq ($(static_libs_only), 1) - DEPLIBS = $(foreach lib,<%foreach(libs)%> <%libname_prefix%><%lib%><%endfor%> <%lit_libs%>, $(foreach libpath, <%libpaths%>, $(wildcard $(libpath)/lib$(lib).a))) + ifeq ($(use_dep_libs), 1) + DEPLIBS = $(foreach lib,<%foreach(libs)%> <%libname_prefix%><%lib%><%endfor%> <%lit_libs%>, $(foreach libpath, <%libpaths%>, $(wildcard $(libpath)/lib$(lib).a))) + endif endif <%endif%> diff --git a/bin/tao_other_tests.lst b/bin/tao_other_tests.lst index 676eb97e446..481191d06e3 100644 --- a/bin/tao_other_tests.lst +++ b/bin/tao_other_tests.lst @@ -142,7 +142,7 @@ TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl: !ST SSL !STATIC TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl: !ST SSL !STATIC TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl: SSL !STATIC TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl: SSL !STATIC -TAO/orbsvcs/tests/Security/Policy/run_test.pl: SSL !STATIC +TAO/orbsvcs/tests/Security/Policies/run_test.pl: SSL !STATIC TAO/orbsvcs/tests/Miop/McastHello/run_test.pl: !MINIMUM !STATIC !SUNCC5_1 !NO_MCAST # The following 2 tests use dynamic loading to change the default reactor on Windows TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index 718a65a52ca..631514f5796 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -291,12 +291,10 @@ endif # threads #### versioned_so on (1). #### exceptions ?= 1 - fast ?= 0 - rtti ?= 1 - versioned_so ?= 1 +use_dep_libs ?= 1 SOVERSION ?= SONAME ?= |