diff options
| author | Jan Jezabek <jezabek@poczta.onet.pl> | 2008-08-15 23:36:23 +0000 |
|---|---|---|
| committer | Jan Jezabek <jezabek@poczta.onet.pl> | 2008-08-15 23:36:23 +0000 |
| commit | 83eff7b8672912730ad2f4e07f3e1f05ed19b2ba (patch) | |
| tree | 1c8d0a911e9b54359ad25cd0fc9544ab6a6eeee6 | |
| parent | 15ab8ba5f34fb281a115c46a4601f4fd4d728fcf (diff) | |
| download | swig-83eff7b8672912730ad2f4e07f3e1f05ed19b2ba.tar.gz | |
Fix buggy virtual_poly C and VBS tests. Minor fixes to MSVC setup in configure.in.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-jezabek@10762 626c5289-ae23-0410-ae9c-e8d60b6d4f22
| -rw-r--r-- | Examples/test-suite/com/virtual_poly_runme.c | 7 | ||||
| -rw-r--r-- | Examples/test-suite/com/virtual_poly_runme.vbs | 5 | ||||
| -rw-r--r-- | configure.in | 10 |
3 files changed, 7 insertions, 15 deletions
diff --git a/Examples/test-suite/com/virtual_poly_runme.c b/Examples/test-suite/com/virtual_poly_runme.c index 3617f7e64..7808d3e41 100644 --- a/Examples/test-suite/com/virtual_poly_runme.c +++ b/Examples/test-suite/com/virtual_poly_runme.c @@ -82,11 +82,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine dc_as_nnumber->lpVtbl->Release(dc_as_nnumber); ic_as_nnumber->lpVtbl->Release(ic_as_nnumber); - dc->lpVtbl->Release(dc); - ic->lpVtbl->Release(ic); - - ic = dic; - dc = ddc; vp->lpVtbl->incr(vp, ic, &ic_temp); ic_temp->lpVtbl->Release(ic_temp); @@ -101,6 +96,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine dc->lpVtbl->Release(dc); ic->lpVtbl->Release(ic); + dic->lpVtbl->Release(dic); + ddc->lpVtbl->Release(ddc); /* * Checking a pure user downcast diff --git a/Examples/test-suite/com/virtual_poly_runme.vbs b/Examples/test-suite/com/virtual_poly_runme.vbs index 6b5b67e4a..3dac0a4ab 100644 --- a/Examples/test-suite/com/virtual_poly_runme.vbs +++ b/Examples/test-suite/com/virtual_poly_runme.vbs @@ -18,11 +18,6 @@ Dim ddc, dic Set ddc = vp.NDouble.narrow(dc) Set dic = vp.NInt.narrow(ic) - -Rem This fails, probably due to a bug in memory management code -Set dc = ddc -Set ic = dic - vp.incr(dic) If (i.get() + 1) <> ic.get() Then diff --git a/configure.in b/configure.in index e0eede42b..cfad94c69 100644 --- a/configure.in +++ b/configure.in @@ -1933,7 +1933,7 @@ if test "gcc" = "$COM_CC" -o "i586-mingw32msvc-gcc" = "$COM_CC" -o "winegcc" = " fi elif test "dmc" = "$COM_CC" ; then COM_CC_SHARED_SWITCHES='-WD -L/exetype:nt' - COM_CC_OUT_SWITCHES='-o' + COM_CC_OUT_SWITCHES=-o COM_CC_SWITCHES='-L/exetype:nt' COM_LIBS='user32.lib kernel32.lib ole32.lib uuid.lib advapi32.lib oleaut32.lib' COM_EXEC_SUFFIX= @@ -1952,10 +1952,10 @@ if test "g++" = "$COM_CXX" -o "i586-mingw32msvc-g++" = "$COM_CXX" -o "wineg++" = COM_CXX_OUT_SWITCHES='-o ' elif test "dmc" = "$COM_CXX" ; then COM_CXX_SHARED_SWITCHES='-WD -Ae -Ar -L/exetype:nt' - COM_CXX_OUT_SWITCHES='-o' -elif test "cl" = "$COM_CC" ; then - COM_CXX_SHARED_SWITCHES=/LD - COM_CXX_OUT_SWITCHES='/Fe' + COM_CXX_OUT_SWITCHES=-o +elif test "cl" = "$COM_CXX" ; then + COM_CXX_SHARED_SWITCHES='/LD /GR /EHs' + COM_CXX_OUT_SWITCHES=/Fe fi if test "cscript" = "$COM_CSCRIPT" ; then |