diff options
| -rw-r--r-- | ACE/ChangeLog | 21 | ||||
| -rw-r--r-- | ACE/ace/Get_Opt.inl | 1 | ||||
| -rw-r--r-- | ACE/ace/Guard_T.cpp | 1 | ||||
| -rw-r--r-- | ACE/ace/Guard_T.inl | 1 | ||||
| -rw-r--r-- | ACE/ace/Handle_Set.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/Handle_Set.h | 1 | ||||
| -rw-r--r-- | ACE/ace/Handle_Set.inl | 12 | ||||
| -rw-r--r-- | ACE/ace/Hash_Multi_Map_Manager_T.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/Hashable.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/Hashable.inl | 2 | ||||
| -rw-r--r-- | ACE/ace/IO_SAP.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/IO_SAP.inl | 1 | ||||
| -rwxr-xr-x | ACE/bin/vx_repo_link.pl | 217 |
13 files changed, 21 insertions, 244 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 99964e1c4f0..d3265a6b33c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,24 @@ +Tue Apr 5 12:36:37 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Get_Opt.inl: + * ace/Guard_T.inl: + * ace/Guard_T.cpp: + * ace/Handle_Set.h: + * ace/Handle_Set.cpp: + * ace/Hash_Multi_Map_Manager_T.cpp: + * ace/Hashable.inl: + * ace/Hashable.cpp: + * ace/IO_SAP.inl: + * ace/IO_SAP.cpp: + Layout changes + + * ace/Handle_Set.inl: + Removed some old includes, should not be a problem with the current + supported platforms + + * bin/vx_repo_link.pl: + Removed this file, vxsim is not supported anymore + Mon Apr 4 09:42:27 UTC 2011 Martin Corino <mcorino@remedy.nl> * include/makeinclude/rules.local.GNU: diff --git a/ACE/ace/Get_Opt.inl b/ACE/ace/Get_Opt.inl index f4d95eba486..a022770b70e 100644 --- a/ACE/ace/Get_Opt.inl +++ b/ACE/ace/Get_Opt.inl @@ -1,5 +1,4 @@ // -*- C++ -*- -// // $Id$ ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Guard_T.cpp b/ACE/ace/Guard_T.cpp index 5648e0c8ab7..cabdf3c0d37 100644 --- a/ACE/ace/Guard_T.cpp +++ b/ACE/ace/Guard_T.cpp @@ -4,7 +4,6 @@ #define ACE_GUARD_T_CPP // FUZZ: disable check_for_ACE_Guard - #include "ace/Guard_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/ACE/ace/Guard_T.inl b/ACE/ace/Guard_T.inl index 56c69af9041..93ff69d9133 100644 --- a/ACE/ace/Guard_T.inl +++ b/ACE/ace/Guard_T.inl @@ -1,5 +1,4 @@ // -*- C++ -*- -// // $Id$ // FUZZ: disable check_for_ACE_Guard diff --git a/ACE/ace/Handle_Set.cpp b/ACE/ace/Handle_Set.cpp index 221794cc4b6..9544a2bc535 100644 --- a/ACE/ace/Handle_Set.cpp +++ b/ACE/ace/Handle_Set.cpp @@ -9,8 +9,6 @@ #include "ace/OS_NS_string.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Handle_Set) diff --git a/ACE/ace/Handle_Set.h b/ACE/ace/Handle_Set.h index 0204edc7c87..9e65f51320e 100644 --- a/ACE/ace/Handle_Set.h +++ b/ACE/ace/Handle_Set.h @@ -58,7 +58,6 @@ public: MAXSIZE = ACE_DEFAULT_SELECT_REACTOR_SIZE }; - // = Initialization methods. /// Constructor, initializes the bitmask to all 0s. ACE_Handle_Set (void); diff --git a/ACE/ace/Handle_Set.inl b/ACE/ace/Handle_Set.inl index a4b1fccaebb..660c5abd18c 100644 --- a/ACE/ace/Handle_Set.inl +++ b/ACE/ace/Handle_Set.inl @@ -4,18 +4,6 @@ #include "ace/Log_Msg.h" -// todo: This should be cleaned up a bit. -// memset for FD_ZERO on OpenBSD and Solaris w/ gcc 2.95.3 -#include "ace/os_include/os_string.h" - -// FreeBSD 4.8-RC? for bzero() used by FD_ZERO -#include "ace/os_include/os_strings.h" - -// IRIX5 defines bzero() in this odd file... used by FD_ZERO -#if defined (ACE_HAS_BSTRING) -# include /**/ <bstring.h> -#endif /* ACE_HAS_BSTRING */ - // AIX defines bzero() in this odd file... used by FD_ZERO #if defined (ACE_HAS_STRINGS) # include "ace/os_include/os_strings.h" diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.cpp b/ACE/ace/Hash_Multi_Map_Manager_T.cpp index 120bc1e96d3..19f9dc8929e 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.cpp +++ b/ACE/ace/Hash_Multi_Map_Manager_T.cpp @@ -9,7 +9,6 @@ */ //============================================================================= - #ifndef ACE_Hash_Multi_Map_Manager_T_CPP #define ACE_Hash_Multi_Map_Manager_T_CPP @@ -27,7 +26,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL - template <class EXT_ID, class INT_ID> ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>::ACE_Hash_Multi_Map_Entry (ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *next, ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID> *prev) diff --git a/ACE/ace/Hashable.cpp b/ACE/ace/Hashable.cpp index 734e38c710d..60f4ae35bc9 100644 --- a/ACE/ace/Hashable.cpp +++ b/ACE/ace/Hashable.cpp @@ -6,8 +6,6 @@ #include "ace/Hashable.inl" #endif /* __ACE_INLINE __ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Hashable::~ACE_Hashable (void) diff --git a/ACE/ace/Hashable.inl b/ACE/ace/Hashable.inl index 7ec54ea1337..2c28a18d455 100644 --- a/ACE/ace/Hashable.inl +++ b/ACE/ace/Hashable.inl @@ -1,8 +1,6 @@ // -*- C++ -*- -// // $Id$ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE diff --git a/ACE/ace/IO_SAP.cpp b/ACE/ace/IO_SAP.cpp index d7c016d874f..ac6a9cc7466 100644 --- a/ACE/ace/IO_SAP.cpp +++ b/ACE/ace/IO_SAP.cpp @@ -12,8 +12,6 @@ #include "ace/IO_SAP.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_IO_SAP) diff --git a/ACE/ace/IO_SAP.inl b/ACE/ace/IO_SAP.inl index 9d7d244e4db..02386927aa4 100644 --- a/ACE/ace/IO_SAP.inl +++ b/ACE/ace/IO_SAP.inl @@ -1,5 +1,4 @@ // -*- C++ -*- -// // $Id$ #include "ace/OS_NS_stropts.h" diff --git a/ACE/bin/vx_repo_link.pl b/ACE/bin/vx_repo_link.pl deleted file mode 100755 index b4ec5f82ed8..00000000000 --- a/ACE/bin/vx_repo_link.pl +++ /dev/null @@ -1,217 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -# $Id$ -# - - -use FindBin; -use lib $FindBin::Bin; - -use diagnostics; -use Time::Local; -use File::Basename; -use File::Spec; -use FileHandle; -use Cwd; - -my $VXDEBUG = (defined $ENV{'VX_REPO_LINK_DEBUG'}) ? $ENV{'VX_REPO_LINK_DEBUG'} : 0; -my $ace_root = $ENV{'ACE_ROOT'}; -$ace_root =~ s/\//\\/g; -my $wind_base = $ENV{'WIND_BASE'}; -$wind_base =~ s/\//\\/g; -my $AR = $ENV{'AR'}; -my $RANLIB = $ENV{'RANLIB'}; -my @lib_arr; -my $lib; -my $curdir = cwd(); -$curdir =~ s/\//\\/g; - - -if ($VXDEBUG > 1) -{ - print STDERR "AR = ". $AR . "\n"; - print STDERR "ACE_ROOT = " . $ace_root . "\n"; - print STDERR "WIND_BASE = " . $wind_base, "\n"; - print STDERR "curdir = " . $curdir, "\n"; -} - -if ($VXDEBUG > 1) { - print STDERR "LINKLIBS are:\n"; -} - -while ($#ARGV >= 0) -{ - if ($ARGV[0] =~ /^-l/) { - $lib = shift; - $lib =~ s/^-l//; - if ($VXDEBUG > 1) { - print STDERR $ace_root."/lib/lib".$lib.".a\n"; - } - push @lib_arr, $lib; - } -} - -my @lib_registry = (); - -my $LINKLIBS = ""; - -my $libobj_dir = ".lib"; -system("if not exist ".$libobj_dir." mkdir ".$libobj_dir); -foreach $lib (@lib_arr) { - my $libname = $ace_root."\\lib\\lib".$lib.".a"; - if (-e $libname) { - if (! -e $libobj_dir."\\lib".$lib.".a") { - if ($VXDEBUG) { - print STDERR "Unpacking ".$lib."...\n"; - } - system("cmd /c if exist ".$libobj_dir."\\".$lib." del /q/f ".$libobj_dir."\\".$lib."\\*.*"); - system("cmd /c (mkdir ".$libobj_dir."\\".$lib." && cd ".$libobj_dir."\\".$lib." && ".$AR." -x ".$libname." && cd ".$curdir.")"); - - if ($VXDEBUG) { - print STDERR "Processing ".$lib."...\n"; - } - - my @rpo_arr = glob ($libobj_dir."\\".$lib."\\*.rpo"); - - if ($VXDEBUG > 1) { - print STDERR "Read #".$#rpo_arr." filenames\n"; - } - - my $line; - my $fh; - my $newfh; - my $module; - foreach $rpo (@rpo_arr) { - if ($VXDEBUG > 2) { - print STDERR $rpo."\n"; - } - $fh = new FileHandle(); - $newfh = new FileHandle(); - $module = basename($rpo, ".rpo"); - open ($newfh, '>', dirname($rpo)."\\".$module.".__rpo"); - open ($fh, '<', $rpo); - while (defined ($line = readline $fh)) { - if ($line =~ /^M /) { - $line =~ s/\//\\/g; - } - elsif ($line =~ /^D /) { - $line =~ s/(^D[ ])(.*ACE_wrappers)(.*)/${1}$ace_root${3}/; - $line =~ s/\//\\/g; - } - elsif ($line =~ /^A /) { - $line =~ s/('-I)([^ ]*ACE_wrappers)([']|[^']+')/${1}$ace_root${3}/g; - $line =~ s/('-I)([^ ]*Tornado[^\/\\]+)([']|[^']+')/${1}$wind_base${3}/g; - $line =~ s/('-o' )('.*')/'-o' '$curdir\/$libobj_dir\/$lib\/$module.o'/g; - $line =~ s/\//\\/g; - } - print $newfh $line; - } - close ($fh); - close ($newfh); - - system("cmd /c (del /f/q ".$rpo." && rename ".dirname($rpo)."\\".$module.".__rpo ".basename($rpo).")"); - } - - $fh = new FileHandle(); - open($fh, '<', $libobj_dir."\\".$lib."\\.prelink.spec"); - my $lnkcmd = readline($fh); - my $arcmd = readline($fh); - my $libdeps = readline($fh); - close($fh); - - $lib_registry[++$#lib_registry] = { - lib => $lib, - linkcmd => $lnkcmd, - arcmd => $arcmd, - libdeps => (defined $libdeps ? $libdeps : '') - }; - } - - $LINKLIBS = $LINKLIBS." ".$libobj_dir."\\lib".$lib.".a"; - } - else { - $LINKLIBS = "-l".$lib." ".$LINKLIBS; - } -} - -sub _find_lib_entry -{ - my $lib = shift; - foreach my $reg (@lib_registry) { - if ($reg->{lib} =~ /(^| )$lib( |$)/) { - return $reg; - } - } - return undef; -} - -sub _prelink_lib -{ - my $lentry = shift; - my $stack = shift; - my $lib = $lentry->{lib}; - my $lnkcmd = $lentry->{linkcmd}; - my $arcmd = $lentry->{arcmd}; - my @deps = split(' ', $lentry->{libdeps}); - - $lnkcmd =~ s/\n//g; - $arcmd =~ s/\n//g; - - if ($VXDEBUG) { - print STDERR "Prelink requested for ".$lib." (dependend on ".join(' ', @deps).")...\n"; - } - - # check dependencies - foreach my $dep (@deps) { - if ($VXDEBUG > 1) { - print STDERR " Checking dependency ".$dep."(stack = ".$stack.")...\n"; - } - if (($stack !~ /\<$dep\>/) && !(-e $libobj_dir."\\lib".$dep.".a")) { - my $le = _find_lib_entry ($dep); - if (defined $le) { - _prelink_lib ($le, $stack." <".$lib.">"); - } - } - } - - # prelink library - if ($VXDEBUG) { - print STDERR "Prelinking ".$lib."...\n"; - } - - my $objs = join(' ', glob ($libobj_dir."\\".$lib."\\*.o")); - my $libs = join(' ', glob ($libobj_dir."\\*.a")); - if ($VXDEBUG > 1) { - print STDERR " > cmd /c ".$lnkcmd." ".$libobj_dir."\\.prelink_lib ".$objs." ".$libs."\n"; - } - system("cmd /c ".$lnkcmd." ".$libobj_dir."\\.prelink_lib ".$objs." ".$libs); - system("cmd /c del /f/q ".$libobj_dir."\\.prelink_lib"); - - # build prelinked library - if ($VXDEBUG) { - print STDERR "Building prelinked lib ".$lib."...\n"; - } - - $arcmd =~ s/lib$lib/$libobj_dir\\lib$lib/; - #$arcmd = $AR." r ".$libobj_dir."\\lib".$lib.".a"; - $arcmd =~ s/ rv / rc /g; - if ($VXDEBUG > 1) { - print STDERR "cmd /c echo ".$objs." | ".$arcmd."\n"; - print STDERR "cmd /c (".$RANLIB." ".$libobj_dir."\\lib".$lib.".a && rmdir /s/q ".$libobj_dir."\\".$lib.")"."\n"; - } - system("cmd /c echo ".$objs." | ".$arcmd); - system("cmd /c (".$RANLIB." ".$libobj_dir."\\lib".$lib.".a && rmdir /s/q ".$libobj_dir."\\".$lib.")"); -} - -foreach my $libentry (@lib_registry) { - if (! -e $libobj_dir."\\lib".$libentry->{lib}.".a") { - _prelink_lib ($libentry, ""); - } -} - -print $LINKLIBS."\n"; - -1; |