projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warning when assertions disabled.
[oota-llvm.git]
/
lib
/
System
/
Mutex.cpp
diff --git
a/lib/System/Mutex.cpp
b/lib/System/Mutex.cpp
index 467bc8522bb3f67ba7fccb6fb705e45f0901b89d..3bef7ce0b02e4fd7656614b7549f13ec2af6e9fd 100644
(file)
--- a/
lib/System/Mutex.cpp
+++ b/
lib/System/Mutex.cpp
@@
-2,8
+2,8
@@
//
// The LLVM Compiler Infrastructure
//
//
// The LLVM Compiler Infrastructure
//
-// This file
was developed by Reid Spencer and is distributed under th
e
-//
University of Illinois Open Source
License. See LICENSE.TXT for details.
+// This file
is distributed under the University of Illinois Open Sourc
e
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
//
//===----------------------------------------------------------------------===//
//
@@
-13,7
+13,6
@@
#include "llvm/Config/config.h"
#include "llvm/System/Mutex.h"
#include "llvm/Config/config.h"
#include "llvm/System/Mutex.h"
-#include "llvm/System/IncludeFile.h"
//===----------------------------------------------------------------------===//
//=== WARNING: Implementation here must contain only TRULY operating system
//===----------------------------------------------------------------------===//
//=== WARNING: Implementation here must contain only TRULY operating system
@@
-76,7
+75,7
@@
Mutex::Mutex( bool recursive)
errorcode = pthread_mutexattr_settype(&attr, kind);
assert(errorcode == 0);
errorcode = pthread_mutexattr_settype(&attr, kind);
assert(errorcode == 0);
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
&& !defined(__NetBSD__)
// Make it a process local mutex
errorcode = pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_PRIVATE);
#endif
// Make it a process local mutex
errorcode = pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_PRIVATE);
#endif
@@
-101,7
+100,7
@@
Mutex::~Mutex()
{
pthread_mutex_t* mutex = reinterpret_cast<pthread_mutex_t*>(data_);
assert(mutex != 0);
{
pthread_mutex_t* mutex = reinterpret_cast<pthread_mutex_t*>(data_);
assert(mutex != 0);
-
int errorcode =
pthread_mutex_destroy(mutex);
+ pthread_mutex_destroy(mutex);
assert(mutex != 0);
}
}
assert(mutex != 0);
}
}
@@
-159,4
+158,3
@@
Mutex::tryacquire()
#endif
#endif
#endif
#endif
-DEFINING_FILE_FOR(SystemMutex)