summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/ChangeLog-99c9
-rw-r--r--TAO/TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp14
-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
6 files changed, 25 insertions, 16 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 32b02f52e16..4fb89bc9654 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,12 @@
+Wed Sep 29 13:01:00 1999 Michael Kircher <Michael.Kircher@mchp.siemens.de>
+
+ * TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp:
+ Fixed some things regarding the handling of the sequence of
+ octets.
+
+ * tests/AMI/simple_client.cpp,
+ tests/AMI/ami_test_i.cpp: Cosmetic changes.
+
Wed Sep 29 12:10:46 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
* orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp
index 540b586df9e..88d4f2b0f12 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_skeleton_cs.cpp
@@ -226,12 +226,14 @@ be_visitor_operation_ami_handler_skeleton_cs::visit_operation (be_operation *nod
else
*os << "_tao_" << original->compute_local_name ("AMI_", "ExceptionHolder");
- *os << " ());" << be_uidt_nl
- << "exception_holder_var->marshaled_exception ().replace" << be_idt_nl
- << "(cdr->length (), // max" << be_nl
- << " cdr->length (), // length" << be_nl
- << " (unsigned char*) cdr->rd_ptr (),// data" << be_nl
- << " 0); // release" << be_uidt_nl;
+ *os << " ());" << be_uidt_nl;
+
+ *os << "Messaging::ExceptionHolder::_tao_seq_Octet_var marshaled_exception_var =" << be_idt_nl
+ << "new Messaging::ExceptionHolder::_tao_seq_Octet (cdr->length (), // max" << be_nl
+ << "cdr->length (), // length" << be_nl
+ << "(unsigned char*) cdr->rd_ptr (),// data" << be_nl
+ << "0); // release" << be_uidt_nl
+ << "exception_holder_var->marshaled_exception (marshaled_exception_var.in ());" << be_nl;
*os << "if (reply_status == TAO_AMI_REPLY_SYSTEM_EXCEPTION)" << be_idt_nl
<< " exception_holder_var->is_system_exception (1);" << be_uidt_nl << be_nl
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;
View Lorry Controller Status