summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ace/Thread_Manager.cpp7
-rw-r--r--include/makeinclude/rules.local.GNU3
2 files changed, 7 insertions, 3 deletions
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index 20ffb676ef9..0f312fa01e1 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -812,11 +812,14 @@ ACE_Thread_Manager::wait_grp (int grp_id)
// Now to do the actual work
int result = 0;
- for (int i = 0; i < copy_count && result != -1; i++)
+
+ for (int i = 0;
+ i < copy_count && result != -1;
+ i++)
if (ACE_Thread::join (copy_table[i].thr_handle_) == -1)
result = -1;
- delete []copy_table;
+ delete [] copy_table;
return result;
}
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index a62237b586b..3f3ee16bfb6 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -133,7 +133,8 @@ endif
clean.local:
-$(RM) -f *.o *~ *.bak *.rpo Makefile.old core
- -$(RM) -rf $(OBJDIRS) $(TEMPINCDIR) ptrepository Templates.DB gcctemp.c gcctemp
+ -$(RM) -rf $(OBJDIRS) $(TEMPINCDIR)
+ -$(RM) -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
realclean.local: clean.local
-$(RM) -f $(BIN:%=%) $(BIN:%=%_debug) $(BIN:%=%_profile) $(BIN:%=%_optimize) $(LIB:%=%) $(LIB:%=%_debug) $(LIB:%=%_profile) $(LIB:%=%_optimize) $(SHLIB:%=%) $(SHLIB:%=%_debug) $(SHLIB:%=%_profile) $(SHLIB:%=%_optimize)