projects
/
libcds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
73bf86c
)
issue#11: tests/cppunit: changed .h file guard prefix to CDS_CPPUNIT_xxx
author
khizmax
<khizmax@gmail.com>
Thu, 22 Jan 2015 11:53:36 +0000
(14:53 +0300)
committer
khizmax
<libcds.dev@gmail.com>
Thu, 22 Jan 2015 21:13:18 +0000
(
00:13
+0300)
tests/cppunit/cppunit_mini.h
patch
|
blob
|
history
tests/cppunit/cppunit_proxy.h
patch
|
blob
|
history
tests/cppunit/file_reporter.h
patch
|
blob
|
history
tests/cppunit/test_beans.h
patch
|
blob
|
history
tests/cppunit/thread.h
patch
|
blob
|
history
tests/unit/ellen_bintree_update_desc_pool.h
patch
|
blob
|
history
tests/unit/michael_alloc.h
patch
|
blob
|
history
diff --git
a/tests/cppunit/cppunit_mini.h
b/tests/cppunit/cppunit_mini.h
index 46545a7441bcde16d080b5715fcc81db53e7f3e9..89ae6d0d3144dd75346c2ace47112510b734d4be 100644
(file)
--- a/
tests/cppunit/cppunit_mini.h
+++ b/
tests/cppunit/cppunit_mini.h
@@
-21,8
+21,8
@@
/* $Id$ */
/* $Id$ */
-#ifndef
_CPPUNIT
MPFR_H_
-#define
_CPPUNIT
MPFR_H_
+#ifndef
CDS_CPPUNIT_
MPFR_H_
+#define
CDS_CPPUNIT_
MPFR_H_
#include <string.h>
#include <sstream>
#include <string.h>
#include <sstream>
@@
-366,4
+366,4
@@
namespace CppUnitMini
error( "CPPUNIT_ASSERT_MSG", st.str().c_str(), __FILE__, __LINE__ ) ; \
}
error( "CPPUNIT_ASSERT_MSG", st.str().c_str(), __FILE__, __LINE__ ) ; \
}
-#endif
+#endif
// #ifndef CDS_CPPUNIT_MPFR_H_
diff --git
a/tests/cppunit/cppunit_proxy.h
b/tests/cppunit/cppunit_proxy.h
index a39cea4e55e291410084481a792ea0f2658bad2d..c4310bcc4883dd0cc2fd6b84cee70b6404b262b5 100644
(file)
--- a/
tests/cppunit/cppunit_proxy.h
+++ b/
tests/cppunit/cppunit_proxy.h
@@
-17,8
+17,8
@@
/* $Id$ */
/* $Id$ */
-#ifndef
_CPPUNIT
PROXYINTERFACE_H_
-#define
_CPPUNIT
PROXYINTERFACE_H_
+#ifndef
CDS_CPPUNIT_
PROXYINTERFACE_H_
+#define
CDS_CPPUNIT_
PROXYINTERFACE_H_
/*
* STLport specific
/*
* STLport specific
@@
-31,4
+31,4
@@
#include "cppunit/cppunit_mini.h"
#include <cds/algo/atomic.h> // for cds::atomicity::empty_item_counter
#include "cppunit/cppunit_mini.h"
#include <cds/algo/atomic.h> // for cds::atomicity::empty_item_counter
-#endif
+#endif
// #ifndef CDS_CPPUNIT_PROXYINTERFACE_H_
diff --git
a/tests/cppunit/file_reporter.h
b/tests/cppunit/file_reporter.h
index dec5b48a6f5c3eb4019918386004e726ac0f500f..1fe4a55d451e9c2bb0f713e0c6a43a80efa9b78f 100644
(file)
--- a/
tests/cppunit/file_reporter.h
+++ b/
tests/cppunit/file_reporter.h
@@
-17,8
+17,8
@@
/* $Id$ */
/* $Id$ */
-#ifndef
_CPPUNIT
MINIFILEREPORTERINTERFACE_H_
-#define
_CPPUNIT
MINIFILEREPORTERINTERFACE_H_
+#ifndef
CDS_CPPUNIT_
MINIFILEREPORTERINTERFACE_H_
+#define
CDS_CPPUNIT_
MINIFILEREPORTERINTERFACE_H_
#include <stdio.h>
#include <stdio.h>
@@
-142,4
+142,4
@@
namespace CppUnitMini {
FILE* _file;
};
}
FILE* _file;
};
}
-#endif /
*_CPPUNITMINIFILEREPORTERINTERFACE_H_*/
+#endif /
/ #ifndef CDS_CPPUNIT_MINIFILEREPORTERINTERFACE_H_
diff --git
a/tests/cppunit/test_beans.h
b/tests/cppunit/test_beans.h
index ae3e486493d059c2016c977b125f22532fee68a4..77654aa3a66bb0577e7e8ed2c93eea83f51e6c8e 100644
(file)
--- a/
tests/cppunit/test_beans.h
+++ b/
tests/cppunit/test_beans.h
@@
-1,5
+1,9
@@
//$$CDS-header$$
//$$CDS-header$$
+#ifndef CDS_CPPUNIT_TEST_BEANS_H
+#define CDS_CPPUNIT_TEST_BEANS_H
+
+
// Forward declarations
namespace cds {
namespace intrusive {}
// Forward declarations
namespace cds {
namespace intrusive {}
@@
-27,3
+31,5
@@
namespace test_beans {
}
};
} // namespace beans
}
};
} // namespace beans
+
+#endif // #ifndef CDS_CPPUNIT_TEST_BEANS_H
diff --git
a/tests/cppunit/thread.h
b/tests/cppunit/thread.h
index 468050dca27bbc7a09ac05df69942a72fbe52fa8..edf0577e55cbcae2a630aff538fab0fb4971d892 100644
(file)
--- a/
tests/cppunit/thread.h
+++ b/
tests/cppunit/thread.h
@@
-1,7
+1,7
@@
//$$CDS-header$$
//$$CDS-header$$
-#ifndef
_
_CPPUNIT_THREAD_H
-#define
_
_CPPUNIT_THREAD_H
+#ifndef
CDS
_CPPUNIT_THREAD_H
+#define
CDS
_CPPUNIT_THREAD_H
#include <cds/details/defs.h>
#include "cppunit/cppunit_mini.h"
#include <cds/details/defs.h>
#include "cppunit/cppunit_mini.h"
@@
-131,4
+131,4
@@
namespace CppUnitMini {
};
}
};
}
-#endif // #ifndef
_
_CPPUNIT_THREAD_H
+#endif // #ifndef
CDS
_CPPUNIT_THREAD_H
diff --git
a/tests/unit/ellen_bintree_update_desc_pool.h
b/tests/unit/ellen_bintree_update_desc_pool.h
index cb599f4b51c4fab2ad93035e2fd1412ed7d88de7..a3dcb85699f6a77c2a3caa8216152a8f5ee8e87a 100644
(file)
--- a/
tests/unit/ellen_bintree_update_desc_pool.h
+++ b/
tests/unit/ellen_bintree_update_desc_pool.h
@@
-1,7
+1,7
@@
//$$CDS-header$$
//$$CDS-header$$
-#ifndef
__CDS_
UNIT_ELLEN_BINTREE_UPDATE_DESC_POOL_H
-#define
__CDS_
UNIT_ELLEN_BINTREE_UPDATE_DESC_POOL_H
+#ifndef
CDS
UNIT_ELLEN_BINTREE_UPDATE_DESC_POOL_H
+#define
CDS
UNIT_ELLEN_BINTREE_UPDATE_DESC_POOL_H
#include <cds/urcu/general_instant.h>
#include <cds/container/details/ellen_bintree_base.h>
#include <cds/urcu/general_instant.h>
#include <cds/container/details/ellen_bintree_base.h>
@@
-99,4
+99,4
@@
namespace ellen_bintree_pool {
} // namespace ellen_bintree_pool
} // namespace ellen_bintree_pool
-#endif // #ifndef
__CDS_
UNIT_ELLEN_BINTREE_UPDATE_DESC_POOL_H
+#endif // #ifndef
CDS
UNIT_ELLEN_BINTREE_UPDATE_DESC_POOL_H
diff --git
a/tests/unit/michael_alloc.h
b/tests/unit/michael_alloc.h
index 745438709e06c2ddd268c0dfb58f357b7b4fd1d5..aad1ef7535163de62c712d098cfc58d1dad09724 100644
(file)
--- a/
tests/unit/michael_alloc.h
+++ b/
tests/unit/michael_alloc.h
@@
-1,7
+1,7
@@
//$$CDS-header$$
//$$CDS-header$$
-#ifndef
__CDS_
UNIT_MICHAEL_ALLOC_H
-#define
__CDS_
UNIT_MICHAEL_ALLOC_H
+#ifndef
CDS
UNIT_MICHAEL_ALLOC_H
+#define
CDS
UNIT_MICHAEL_ALLOC_H
#include <cds/memory/michael/allocator.h>
#include <memory>
#include <cds/memory/michael/allocator.h>
#include <memory>
@@
-64,4
+64,4
@@
namespace memory {
};
} // namespace memory
};
} // namespace memory
-#endif
+#endif
// #ifndef CDSUNIT_MICHAEL_ALLOC_H