Update of /cvsroot/cppunit/cppunit2/include/cpptl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31624/include/cpptl
Modified Files:
config.h
Log Message:
* added portable int64_t and uint64_t
* fixed some macros prefix
* fixed VC6 profile
Index: config.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/config.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** config.h 15 Nov 2004 08:12:20 -0000 1.3
--- config.h 15 Nov 2004 08:19:53 -0000 1.4
***************
*** 9,15 ****
--- 9,18 ----
# if _MSC_VER <= 1200 // VC++ 6 or before
# pragma warning( disable : 4786 ) // ident trunc to '255' chars in debug info
+ # pragma warning( disable : 4800 ) // forcing value to bool performance warning
+ # pragma warning( disable : 4018 ) // '<' signed/unsigned mismatch
# define CPPTL_NO_VECTOR_STD_ITERATOR
# define CPPTL_NO_FUNCTION_TEMPLATE_ORDERING
# define CPPTL_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+ # define CPPTL_HAS_INT64 1
# endif
***************
*** 26,29 ****
--- 29,34 ----
# if _MSC_VER >= 1310 // VC++ 7.1
+ # define CPPTL_HAS_INT64 1
+ # define CPPTL_HAS_LONGLONG 1
# pragma warning( disable : 4800 ) // forcing value to bool performance warning
# pragma warning( disable : 4018 ) // '<' signed/unsigned mismatch
***************
*** 44,54 ****
# endif
! /// CPPUT_STATIC_CONSTANT is defined to declare a static constant in a class
! /// struct A { CPPUT_STATIC_CONSTANT( x, 1 ) }; // A::x = 1
# if defined(CPPTL_NO_ENUM_STATIC_CONSTANT)
! # define CPPUT_STATIC_CONSTANT( type, assignment ) \
static const int assignment
# else
! # define CPPUT_STATIC_CONSTANT( type, assignment ) \
enum { assignment }
# endif
--- 49,59 ----
# endif
! /// CPPTL_STATIC_CONSTANT is defined to declare a static constant in a class
! /// struct A { CPPTL_STATIC_CONSTANT( x, 1 ) }; // A::x = 1
# if defined(CPPTL_NO_ENUM_STATIC_CONSTANT)
! # define CPPTL_STATIC_CONSTANT( type, assignment ) \
static const int assignment
# else
! # define CPPTL_STATIC_CONSTANT( type, assignment ) \
enum { assignment }
# endif
***************
*** 61,64 ****
--- 66,74 ----
# endif
+ // auto-link specification
+ ///////////////////////////////////////////////////////////////////////////
+
+ # define CPPTL_API
+
///////////////////////////////////////////////////////////////////////////
***************
*** 67,73 ****
--- 77,99 ----
(void)(0)
+ # define CPPTL_DEBUG_ASSERT_UNREACHABLE \
+ (void)(0)
+
namespace CppTL {
+ // defines portable int64_t && uint64_t
+ # ifndef CPPTL_NO_INT64
+ # if CPPTL_HAS_LONGLONG
+ typedef long long int64_t;
+ typedef unsigned long long uint64_t;
+ # elif CPPTL_HAS_INT64
+ typedef __int64 int64_t;
+ typedef unsigned __int64 uint64_t;
+ # else
+ # define CPPTL_NO_INT64 1
+ # endif
+ # endif
+
template<class T>
struct Type
***************
*** 76,79 ****
--- 102,123 ----
};
+
+ /// Base class for non copyable class.
+ class CPPTL_API NonCopyable
+ {
+ public:
+ NonCopyable()
+ {
+ }
+
+ ~NonCopyable()
+ {
+ }
+
+ private:
+ NonCopyable( const NonCopyable &other );
+ void operator =( const NonCopyable &other );
+ };
+
} // namespace CppTL
|
