summaryrefslogtreecommitdiff
path: root/src/socket.cpp
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2011-08-12 23:34:12 +0200
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2011-08-12 23:34:12 +0200
commit72e4c8f5233608924ccd58d178593eb7e69bed17 (patch)
tree8275477f2b34d3dd5406c6d1a02726d25394dd41 /src/socket.cpp
parent835d2e4b5f92a5f9891fce8f958a4985cc53f1cf (diff)
downloadminetest-72e4c8f5233608924ccd58d178593eb7e69bed17.tar.gz
minetest-72e4c8f5233608924ccd58d178593eb7e69bed17.tar.bz2
minetest-72e4c8f5233608924ccd58d178593eb7e69bed17.zip
Fix use of && instead of &
Diffstat (limited to 'src/socket.cpp')
-rw-r--r--src/socket.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/socket.cpp b/src/socket.cpp
index a7d204047..ac4871f61 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -100,10 +100,10 @@ void Address::Resolve(const char *name)
std::string Address::serializeString()
{
unsigned int a, b, c, d;
- a = (m_address && 0xFF000000)>>24;
- b = (m_address && 0x00FF0000)>>16;
- c = (m_address && 0x0000FF00)>>8;
- d = (m_address && 0x000000FF);
+ a = (m_address & 0xFF000000)>>24;
+ b = (m_address & 0x00FF0000)>>16;
+ c = (m_address & 0x0000FF00)>>8;
+ d = (m_address & 0x000000FF);
return itos(a)+"."+itos(b)+"."+itos(c)+"."+itos(d);
}