summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@users.noreply.github.com>2016-11-30 19:24:26 +0100
committerGitHub <noreply@github.com>2016-11-30 19:24:26 +0100
commit0fc695d162ed1bd60551ebdec49cb96bea62fdf7 (patch)
tree01142d2651138cb7cc88ae3221820fe2fdc7982a
parent641df06c62a34e26c62b593d042ab0a5e29d11e7 (diff)
parentcec147c4573f9ad41e4840d6e53e4980a93bff67 (diff)
downloadATCD-0fc695d162ed1bd60551ebdec49cb96bea62fdf7.tar.gz
Merge pull request #336 from jwillemsen/master
Doxygen improvements and small extension to fuzz script
-rw-r--r--ACE/ace/Condition_Thread_Mutex.h10
-rwxr-xr-xACE/bin/fuzz.pl2
2 files changed, 6 insertions, 6 deletions
diff --git a/ACE/ace/Condition_Thread_Mutex.h b/ACE/ace/Condition_Thread_Mutex.h
index 6ba91871e1a..0c40993020c 100644
--- a/ACE/ace/Condition_Thread_Mutex.h
+++ b/ACE/ace/Condition_Thread_Mutex.h
@@ -76,9 +76,9 @@ public:
/**
* Block on condition, or until absolute time-of-day has passed. If
- * abstime == 0 use "blocking" <wait> semantics. Else, if @a abstime
+ * abstime == 0 use "blocking" wait semantics. Else, if @a abstime
* != 0 and the call times out before the condition is signaled
- * <wait> returns -1 and sets errno to ETIME.
+ * wait() returns -1 and sets errno to ETIME.
*/
int wait (const ACE_Time_Value *abstime);
@@ -117,11 +117,11 @@ protected:
/// Reference to mutex lock.
ACE_Thread_Mutex &mutex_;
- /// Keeps track of whether <remove> has been called yet to avoid
- /// multiple <remove> calls, e.g., explicitly and implicitly in the
+ /// Keeps track of whether remove() has been called yet to avoid
+ /// multiple remove() calls, e.g., explicitly and implicitly in the
/// destructor. This flag isn't protected by a lock, so make sure
/// that you don't have multiple threads simultaneously calling
- /// <remove> on the same object, which is a bad idea anyway...
+ /// remove() on the same object, which is a bad idea anyway...
bool removed_;
private:
diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl
index eba916638ea..0d7ced3a25f 100755
--- a/ACE/bin/fuzz.pl
+++ b/ACE/bin/fuzz.pl
@@ -1253,7 +1253,7 @@ sub check_for_empty_files ()
return if is_suppressed ();
print "Running empty file test\n";
- foreach $file (@files_inl, @files_cpp) {
+ foreach $file (@files_inl, @files_cpp, @files_rb) {
my $found_non_empty_line = 0;
if (open (FILE, $file)) {
print "Looking at file $file\n" if $opt_d;