diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-20 04:11:11 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-20 04:11:11 +0000 |
| commit | 95a7b0ccd83a2fcf7cae621a567e2d3a61ffbb05 (patch) | |
| tree | 1bf8dfb5d2d24b903978d9a862bbdc42f9a78000 | |
| parent | 3b0bc5e788bccf7a7f83dca3be411f0b1d7269e0 (diff) | |
| download | ATCD-95a7b0ccd83a2fcf7cae621a567e2d3a61ffbb05.tar.gz | |
ChangeLogTag:Mon Jan 19 22:03:38 1998 <coryan@MILONGA>
| -rw-r--r-- | TAO/ChangeLog-98c | 14 | ||||
| -rw-r--r-- | TAO/tao/sequence_T.i | 2 | ||||
| -rw-r--r-- | TAO/tests/POA/NewPOA/NewPOA.cpp | 7 | ||||
| -rw-r--r-- | TAO/tests/POA/NewPOA/NewPOA.dsp | 4 |
4 files changed, 20 insertions, 7 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 9f3aa0ef40a..4d39fd94e79 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,17 @@ +Mon Jan 19 22:03:38 1998 <coryan@MILONGA> + + * tao/sequence_T.i: + Object_Manager constructor was calling _duplicate(). That is not + the right semantics, and produces a crash when working on an + unitialized buffer. + + * tests/POA/NewPOA/NewPOA.cpp: + * tests/POA/NewPOA/NewPOA.dsp: + Fixed signed/unsigned warning. + + * tests/POA/NewPOA/NewPOA.dsp: + Fixed missing options to find ACE. + Mon Jan 19 16:36:22 1998 Carlos O'Ryan <coryan@cs.wustl.edu> * tao/iiopobj.h: diff --git a/TAO/tao/sequence_T.i b/TAO/tao/sequence_T.i index 4e05e5ea544..f65cc2a8401 100644 --- a/TAO/tao/sequence_T.i +++ b/TAO/tao/sequence_T.i @@ -123,8 +123,6 @@ TAO_Object_Manager<T>::TAO_Object_Manager(T** buffer, CORBA::Boolean release) : ptr_ (buffer), release_ (release) { - if (this->release_) - T::_duplicate (*this->ptr_); } template <class T> ACE_INLINE diff --git a/TAO/tests/POA/NewPOA/NewPOA.cpp b/TAO/tests/POA/NewPOA/NewPOA.cpp index b2183638efe..bb0dc10bd6c 100644 --- a/TAO/tests/POA/NewPOA/NewPOA.cpp +++ b/TAO/tests/POA/NewPOA/NewPOA.cpp @@ -39,10 +39,11 @@ main (int argc, char **argv) return -1; } - for (int i = 0; i < policies.length () && env.exception == 0; i++) + for (CORBA::ULong i = 0; + i < policies.length () && env.exception == 0; + ++i) { - // const CORBA::Policy_ptr policy = policies[i]; - const PortableServer::Policy_ptr policy = policies[i]; + PortableServer::Policy_ptr policy = policies[i]; policy->destroy (env); } if (env.exception () != 0) diff --git a/TAO/tests/POA/NewPOA/NewPOA.dsp b/TAO/tests/POA/NewPOA/NewPOA.dsp index 4562de8d25a..c08f53cc1df 100644 --- a/TAO/tests/POA/NewPOA/NewPOA.dsp +++ b/TAO/tests/POA/NewPOA/NewPOA.dsp @@ -64,7 +64,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -72,7 +72,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\\"
+# ADD LINK32 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
# SUBTRACT LINK32 /pdb:none
!ENDIF
|