summaryrefslogtreecommitdiff
path: root/src/networkAddress.cpp
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2014-06-22 23:47:20 +0000
committerChristian Pointner <equinox@anytun.org>2014-06-22 23:47:20 +0000
commitbcb7bacbfefac35ebe27b8ded9cc94663478081f (patch)
treedb6c54f1bc13e96fddac438dcdff1a53ce574f16 /src/networkAddress.cpp
parentmerged nettle featuer branch to trunk (diff)
parentadded support for clang (diff)
merged clang branch
Diffstat (limited to 'src/networkAddress.cpp')
-rw-r--r--src/networkAddress.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/networkAddress.cpp b/src/networkAddress.cpp
index a035fd6..370c81a 100644
--- a/src/networkAddress.cpp
+++ b/src/networkAddress.cpp
@@ -177,7 +177,7 @@ ethernet_bytes_type NetworkAddress::to_bytes_ethernet() const
boost::array<unsigned char,6> result;
uint64_t ether=ethernet_address_;
for(int i = 0; i < 6; i++) {
- result[i] = (unsigned char)(ether && 0xff);
+ result[i] = (unsigned char)(ether & 0xff);
ether >>= 8;
}
return result;