From ac9def42f69b3d25a6d8e803da44c8b3410c8746 Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 14 Mar 2013 17:15:33 +0000 Subject: [PATCH] stupid win32 namespace collision --- panda/src/net/connectionManager.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panda/src/net/connectionManager.h b/panda/src/net/connectionManager.h index 2d43b22c95..73c4c60875 100644 --- a/panda/src/net/connectionManager.h +++ b/panda/src/net/connectionManager.h @@ -141,8 +141,8 @@ private: friend class Connection; }; -INLINE ostream &operator << (ostream &out, const ConnectionManager::Interface &interface) { - interface.output(out); +INLINE ostream &operator << (ostream &out, const ConnectionManager::Interface &iface) { + iface.output(out); return out; }