diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2010-01-27 22:52:17 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2010-01-27 22:52:17 +0000 |
| commit | 317d6f8523dc17a658950e3afb19ae8c125c3e8c (patch) | |
| tree | 787bf752a6fc05487f2e6cf84bd82a2adaccb374 | |
| parent | c439176c5fecdd06d993e1ec121a0b413e834816 (diff) | |
| download | ATCD-317d6f8523dc17a658950e3afb19ae8c125c3e8c.tar.gz | |
ChangeLogTag: Wed Jan 27 22:36:36 UTC 2010 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 12 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_win32_msvc.GNU | 2 | ||||
| -rw-r--r-- | ACE/tests/Bug_3709_Regression_Test.cpp | 8 |
3 files changed, 20 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index adcb679dd48..c16b12101b4 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,8 +1,18 @@ +Wed Jan 27 22:36:36 UTC 2010 Adam Mitz <mitza@ociweb.com> + + * include/makeinclude/platform_win32_msvc.GNU: + + Trim trailing slashes from libpath entries. + + * tests/Bug_3709_Regression_Test.cpp: + + This test doesn't compile on MSVC 7.1. + Wed Jan 27 05:33:56 UTC 2010 Abdul Sowayan <sowayan@gmail.com> * ace/config-macosx-iphone-hardware.h: - undefined ACE_HAS_SYSV_IPC, it doesn't seem that the + undefined ACE_HAS_SYSV_IPC, it doesn't seem that the iphone-hardware platform supports it. Tue Jan 26 22:55:18 UTC 2010 Adam Mitz <mitza@ociweb.com> diff --git a/ACE/include/makeinclude/platform_win32_msvc.GNU b/ACE/include/makeinclude/platform_win32_msvc.GNU index 962f8870ec5..8bec8100e42 100644 --- a/ACE/include/makeinclude/platform_win32_msvc.GNU +++ b/ACE/include/makeinclude/platform_win32_msvc.GNU @@ -116,7 +116,7 @@ CXXFLAGS = $(CFLAGS) RC_INCLUDE_FLAG = -I RC_OUTPUT_FLAG = -fo SYSTEMLIBS += advapi32.lib user32.lib -MSVC_LINK = $(LD) $(SYSTEMLIBS) $(MSVC_LDFLAGS) $(patsubst -L%,-libpath:%, $(subst /,\,$(LDFLAGS))) $(patsubst -l%,%.lib,$(ACE_SHLIBS)) $(LIBS) -out:$@ +MSVC_LINK = $(LD) $(SYSTEMLIBS) $(MSVC_LDFLAGS) $(patsubst %\,%,$(patsubst -L%,-libpath:%, $(subst /,\,$(LDFLAGS)))) $(patsubst -l%,%.lib,$(ACE_SHLIBS)) $(LIBS) -out:$@ define SOLINK.cc.override $(MSVC_LINK) $(MSVC_DLLFLAGS) $^ mt -nologo -manifest $@.manifest -outputresource:$@\;2 diff --git a/ACE/tests/Bug_3709_Regression_Test.cpp b/ACE/tests/Bug_3709_Regression_Test.cpp index 131a0d2a45e..5fc6f8646c8 100644 --- a/ACE/tests/Bug_3709_Regression_Test.cpp +++ b/ACE/tests/Bug_3709_Regression_Test.cpp @@ -18,6 +18,11 @@ ACE_RCSID (tests, Bug_3709_Regression_Test, "$Id$") +#if defined(_MSC_VER) && _MSC_VER < 1400 +#define MSVC_71_OR_OLDER +#endif + +#ifndef MSVC_71_OR_OLDER template<template<typename U, typename = std::allocator<U> > class container, typename DT> container<DT> initializer(const DT &d) { @@ -25,14 +30,17 @@ container<DT> initializer(const DT &d) t.insert(t.end(), d); return t; } +#endif int run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("Bug_3709_Regression_Test")); +#ifndef MSVC_71_OR_OLDER vector<int> v = initializer<vector>(5); v.clear (); +#endif ACE_END_TEST; |