summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2003-12-10 12:33:32 +0000
committerbala <balanatarajan@users.noreply.github.com>2003-12-10 12:33:32 +0000
commit49fa204a40bb92fa8e18477a8a9db8872efbe2da (patch)
treee0c67f5bec15fece1c5c484712d5ace53c130b94
parent3b1791e70784eae8546e6707eda484d03c3ec88a (diff)
downloadATCD-49fa204a40bb92fa8e18477a8a9db8872efbe2da.tar.gz
ChangeLogTag:Wed Dec 10 06:31:53 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.Bug_1630_testclient2
-rw-r--r--TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp4
3 files changed, 14 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c141cc346fe..4b203349c3c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Wed Dec 10 06:31:53 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * orbsvcs/tests/Bug_1630_Regression/Makefile.Bug_1630_testclient:
+
+ Do not compile if minimum_corba is enabled.
+
+ BTW, this test and the Makefiles needs cleaning up. Will get to
+ that soon.
+
Wed Dec 10 06:12:26 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* orbsvcs/tests/Bug_1395_Regression/Makefile.Bug_1395_Client:
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.Bug_1630_testclient b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.Bug_1630_testclient
index 4b307df5855..6dc2e7748c7 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.Bug_1630_testclient
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.Bug_1630_testclient
@@ -45,7 +45,9 @@ $(TEMPINCDIR):
endif
+ifeq ($(minimum_corba),0)
BIN = $(BIN_UNCHECKED)
+endif #minimum_corba
OBJS = $(addsuffix .o, $(notdir $(FILES)))
SRC = $(addsuffix .cpp, $(FILES))
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
index d34bd74da43..039612ba778 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
@@ -120,7 +120,9 @@ int main( int argc, char* argv[] )
ACE_DEBUG((LM_DEBUG, "About to call create_operation_list\n"));
- orb->create_operation_list( operation.in(), opList.out() ACE_ENV_ARG_PARAMETER) ;
+ orb->create_operation_list(operation.in (),
+ opList.out()
+ ACE_ENV_ARG_PARAMETER) ;
ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG, "Call to create_operation_list succeeded\n"));