You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
826 B
26 lines
826 B
diff -Naur mico.orig/Makefile mico/Makefile |
|
--- mico.orig/Makefile Fri Feb 14 11:55:53 2003 |
|
+++ mico/Makefile Fri Feb 14 14:15:35 2003 |
|
@@ -72,7 +72,7 @@ |
|
$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico; \ |
|
$(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/doc/mico/manual.ps; \ |
|
fi |
|
- -ldconfig |
|
+# -ldconfig |
|
|
|
install-cd: |
|
for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done |
|
diff -Naur mico.orig/orb/poa_impl.cc mico/orb/poa_impl.cc |
|
--- mico.orig/orb/poa_impl.cc.orig Sat Feb 22 23:20:22 2003 |
|
+++ mico/orb/poa_impl.cc Sat Feb 22 23:20:55 2003 |
|
@@ -3768,7 +3768,9 @@ |
|
// we are finished |
|
|
|
//this make sure nobody is going to remove the object |
|
- orec->invoke_cnt++; |
|
+ if (servant_retention_policy->value() == PortableServer::RETAIN) { |
|
+ orec->invoke_cnt++; |
|
+ } |
|
} // end autolock |
|
|
|
/*
|
|
|