gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

assert: use our assert

Browse Source 
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2011-08-31 09:54:21 -07:00
parent 5ae3e13617
commit cf862c65fd
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/auth/Crypto.cc
View File

@ -11,7 +11,6 @@
*
*/
#include <assert.h>
#include <sstream>
#include "Crypto.h"
#ifdef USE_CRYPTOPP
@ -24,6 +23,7 @@
# include <pk11pub.h>
#endif
#include "include/assert.h"
#include "common/Clock.h"
#include "common/armor.h"
#include "common/ceph_crypto.h"

3
src/common/DoutStreambuf.cc
View File

@ -24,7 +24,6 @@
#include "include/utime.h"
#include <values.h>
#include <assert.h>
#include <errno.h>
#include <fstream>
#include <iostream>
@ -35,6 +34,8 @@
#include <string.h>
#include <syslog.h>
#include "include/assert.h"
///////////////////////////// Constants /////////////////////////////
#define TIME_FMT "%04d-%02d-%02d %02d:%02d:%02d.%06ld"
#define TIME_FMT_SZ 26

2
src/common/Thread.cc
View File

@ -17,7 +17,6 @@
#include "common/debug.h"
#include "common/signal.h"
#include <assert.h>
#include <dirent.h>
#include <errno.h>
#include <iostream>
@ -29,6 +28,7 @@
#include <sys/types.h>
#include <sys/user.h> // for PAGE_MASK
Thread::
Thread()
: thread_id(0)

2
src/include/Context.h
View File

@ -17,8 +17,8 @@
#define CEPH_CONTEXT_H
#include "common/dout.h"
#include "include/assert.h"
#include "assert.h"
#include <list>
#include <set>

4
src/include/assert.h
View File

@ -14,7 +14,7 @@
* <assert.h> again later.
*/
#ifndef NO_ATOMIC_OPS
#include "atomic_ops.h"
# include "atomic_ops.h"
#endif
struct CephContext;
@ -114,3 +114,5 @@ using namespace ceph;
((expr) \
? __CEPH_ASSERT_VOID_CAST (0) \
: __ceph_assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION))
#undef _ASSERT_H