--- a/src/core/model/int64x64.h Fri May 13 14:51:51 2011 -0400
+++ b/src/core/model/int64x64.h Fri May 13 14:52:27 2011 -0400
@@ -15,57 +15,57 @@
namespace ns3 {
-#define INT64X64_OP_ARITH_TYPE(op,type) \
+#define INT64X64_OP_ARITH_TYPE(op,type) \
inline int64x64_t operator op (const int64x64_t &lhs, const type rhs) \
- { \
- int64x64_t tmp = lhs; \
- tmp op##= int64x64_t (rhs); \
- return tmp; \
- } \
+ { \
+ int64x64_t tmp = lhs; \
+ tmp op ##= int64x64_t (rhs); \
+ return tmp; \
+ } \
inline int64x64_t operator op (const type lhs, const int64x64_t &rhs) \
- { \
- int64x64_t tmp = int64x64_t (lhs); \
- tmp op##= rhs; \
- return tmp; \
+ { \
+ int64x64_t tmp = int64x64_t (lhs); \
+ tmp op ##= rhs; \
+ return tmp; \
}
-#define INT64X64_OP_ARITH(op) \
+#define INT64X64_OP_ARITH(op) \
inline int64x64_t operator op (const int64x64_t &lhs, const int64x64_t &rhs) \
- { \
- int64x64_t tmp = lhs; \
- tmp op##= rhs; \
- return tmp; \
- } \
- INT64X64_OP_ARITH_TYPE(op,double) \
- INT64X64_OP_ARITH_TYPE(op,signed char) \
- INT64X64_OP_ARITH_TYPE(op,signed short) \
- INT64X64_OP_ARITH_TYPE(op,signed int) \
- INT64X64_OP_ARITH_TYPE(op,signed long int) \
- INT64X64_OP_ARITH_TYPE(op,signed long long int) \
- INT64X64_OP_ARITH_TYPE(op,unsigned char) \
- INT64X64_OP_ARITH_TYPE(op,unsigned short) \
- INT64X64_OP_ARITH_TYPE(op,unsigned int) \
- INT64X64_OP_ARITH_TYPE(op,unsigned long int) \
- INT64X64_OP_ARITH_TYPE(op,unsigned long long int)
+ { \
+ int64x64_t tmp = lhs; \
+ tmp op ##= rhs; \
+ return tmp; \
+ } \
+ INT64X64_OP_ARITH_TYPE(op,double) \
+ INT64X64_OP_ARITH_TYPE(op,signed char) \
+ INT64X64_OP_ARITH_TYPE(op,signed short) \
+ INT64X64_OP_ARITH_TYPE(op,signed int) \
+ INT64X64_OP_ARITH_TYPE(op,signed long int) \
+ INT64X64_OP_ARITH_TYPE(op,signed long long int) \
+ INT64X64_OP_ARITH_TYPE(op,unsigned char) \
+ INT64X64_OP_ARITH_TYPE(op,unsigned short) \
+ INT64X64_OP_ARITH_TYPE(op,unsigned int) \
+ INT64X64_OP_ARITH_TYPE(op,unsigned long int) \
+ INT64X64_OP_ARITH_TYPE(op,unsigned long long int)
-#define INT64X64_OP_CMP_TYPE(op,type) \
- inline bool operator op (const int64x64_t &lhs, const type &rhs) \
- { \
- return lhs op int64x64_t (rhs); \
- } \
- inline bool operator op (const type &lhs, const int64x64_t &rhs) \
- { \
- return int64x64_t (lhs) op rhs; \
+#define INT64X64_OP_CMP_TYPE(op,type) \
+ inline bool operator op (const int64x64_t &lhs, const type &rhs) \
+ { \
+ return lhs op int64x64_t (rhs); \
+ } \
+ inline bool operator op (const type &lhs, const int64x64_t &rhs) \
+ { \
+ return int64x64_t (lhs) op rhs; \
}
-#define INT64X64_OP_CMP(op) \
- INT64X64_OP_CMP_TYPE(op,double) \
- INT64X64_OP_CMP_TYPE(op,signed int) \
- INT64X64_OP_CMP_TYPE(op,signed long int) \
- INT64X64_OP_CMP_TYPE(op,signed long long int) \
- INT64X64_OP_CMP_TYPE(op,unsigned int) \
- INT64X64_OP_CMP_TYPE(op,unsigned long int) \
- INT64X64_OP_CMP_TYPE(op,unsigned long long int)
+#define INT64X64_OP_CMP(op) \
+ INT64X64_OP_CMP_TYPE(op,double) \
+ INT64X64_OP_CMP_TYPE(op,signed int) \
+ INT64X64_OP_CMP_TYPE(op,signed long int) \
+ INT64X64_OP_CMP_TYPE(op,signed long long int) \
+ INT64X64_OP_CMP_TYPE(op,unsigned int) \
+ INT64X64_OP_CMP_TYPE(op,unsigned long int) \
+ INT64X64_OP_CMP_TYPE(op,unsigned long long int)
INT64X64_OP_ARITH(+)
@@ -84,17 +84,17 @@
inline int64x64_t Abs (const int64x64_t &value)
{
- return (value < 0)?-value:value;
+ return (value < 0) ? -value : value;
}
inline int64x64_t Min (const int64x64_t &a, const int64x64_t &b)
{
- return (a < b)?a:b;
+ return (a < b) ? a : b;
}
inline int64x64_t Max (const int64x64_t &a, const int64x64_t &b)
{
- return (a > b)?a:b;
+ return (a > b) ? a : b;
}
} // namespace ns3