summaryrefslogtreecommitdiff
path: root/TAO/tests
diff options
context:
space:
mode:
authormk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-09-29 18:06:07 +0000
committermk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-09-29 18:06:07 +0000
commitb529e4501856868c39b08ceba593defd0df2ef2b (patch)
tree3f8a51fb4e4d2fe7835c9bb0485676409c386b42 /TAO/tests
parent5e0a6c6c31017a2b82d5d34b96d7c99ba1f562f2 (diff)
downloadATCD-b529e4501856868c39b08ceba593defd0df2ef2b.tar.gz
ChangeLogTag: Wed Sep 29 13:01:00 1999 Michael Kircher <Michael.Kircher@mchp.siemens.de>
Diffstat (limited to 'TAO/tests')
-rw-r--r--TAO/tests/AMI/AMI_Test_Client.dsp6
-rw-r--r--TAO/tests/AMI/AMI_Test_Server.dsp6
-rw-r--r--TAO/tests/AMI/ami_test_i.cpp2
-rw-r--r--TAO/tests/AMI/simple_client.cpp4
4 files changed, 8 insertions, 10 deletions
diff --git a/TAO/tests/AMI/AMI_Test_Client.dsp b/TAO/tests/AMI/AMI_Test_Client.dsp
index 72cf6f087e2..b58bbb7dbfd 100644
--- a/TAO/tests/AMI/AMI_Test_Client.dsp
+++ b/TAO/tests/AMI/AMI_Test_Client.dsp
@@ -66,8 +66,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug"
# 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 "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# 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 "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -163,7 +163,7 @@ InputPath=.\ami_test.idl
InputName=ami_test
BuildCmds= \
- ..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl
+ ..\..\..\bin\tao_idl -Ge 1 -GC -Gv $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/AMI/AMI_Test_Server.dsp b/TAO/tests/AMI/AMI_Test_Server.dsp
index 96cc13c5de1..227afdc6fe7 100644
--- a/TAO/tests/AMI/AMI_Test_Server.dsp
+++ b/TAO/tests/AMI/AMI_Test_Server.dsp
@@ -66,8 +66,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug"
# 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 "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# 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 "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -171,7 +171,7 @@ InputPath=.\ami_test.idl
InputName=ami_test
BuildCmds= \
- ..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl
+ ..\..\..\bin\tao_idl -Ge 1 -Gv -GC $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp
index f5ac7ba2b51..4f8b2028a83 100644
--- a/TAO/tests/AMI/ami_test_i.cpp
+++ b/TAO/tests/AMI/ami_test_i.cpp
@@ -45,14 +45,12 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
in_l,
in_str));
-#ifdef TAO_HAS_AMI_EXCEPTIONS
if (in_l == 0)
{
ACE_DEBUG ((LM_DEBUG,
"Throwing Exception: DidNotWork\n"));
ACE_TRY_THROW (A::DidNotWork());
}
-#endif
return 931234;
}
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index 2cde0dd9005..159042d63ff 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -194,7 +194,7 @@ main (int argc, char *argv[])
ni));
ami_test_var->sendc_foo (the_handler_var.in (),
- 13,
+ 0,
"Let's talk AMI.",
ACE_TRY_ENV);
ACE_TRY_CHECK;
@@ -236,7 +236,7 @@ main (int argc, char *argv[])
CORBA::Long number = ami_test_var->foo (l,
l,
- "Let's talk AMI.",
+ "Let's talk SMI.",
ACE_TRY_ENV);
ACE_TRY_CHECK;