summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2003-10-31 13:55:53 +0000
committerbala <balanatarajan@users.noreply.github.com>2003-10-31 13:55:53 +0000
commit4f9ab2ce6a92ea9fa106330b998c24e21e21843c (patch)
tree8eb4991328ca12a419a7a09bb4e630394e358eae
parentbdad111aafa0b95c6f1c1467ed4aa33692898a92 (diff)
downloadATCD-4f9ab2ce6a92ea9fa106330b998c24e21e21843c.tar.gz
ChangeLogTag:Fri Oct 31 07:59:13 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/examples/Buffered_Oneways/Makefile4
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp3
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp3
4 files changed, 14 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ecfb03098a8..c0aee75a76b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Fri Oct 31 07:59:13 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * examples/Buffered_Oneways/Makefile:
+ * examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp:
+ * examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp:
+
+ Fixed simple compilation errors in static builds.
+
Fri Oct 31 13:47:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Parser_Registry.h:
diff --git a/TAO/examples/Buffered_Oneways/Makefile b/TAO/examples/Buffered_Oneways/Makefile
index 27713c73cd8..f6ea0d3eefc 100644
--- a/TAO/examples/Buffered_Oneways/Makefile
+++ b/TAO/examples/Buffered_Oneways/Makefile
@@ -46,10 +46,10 @@ include $(TAO_ROOT)/taoconfig.mk
.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
server: $(addprefix $(VDIR),$(SERVER_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_SRVR_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging -lTAO_Valuetype $(TAO_SRVR_LIBS) $(POSTLINK)
client: $(addprefix $(VDIR),$(CLIENT_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_CLNT_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging -lTAO_Valuetype $(TAO_CLNT_LIBS) $(POSTLINK)
realclean: clean
-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index 9e64c8a1409..fcf78bada34 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -125,7 +125,8 @@ Content_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
ACE_CHECK;
// Decrease the reference count on our selves.
- this->_remove_ref ();
+ this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK;
}
int
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index 1f60aaaea0f..1e6b5c4ec8b 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -137,7 +137,8 @@ Content_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
ACE_CHECK;
// Decrease the reference count on our selves.
- this->_remove_ref ();
+ this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK;
}
int