Fixed multiple warnings and errors that blocked c++0x

This allows the server to compile with c++0x (and enables it).
This also includes some coding style / readabillity fixes.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/common/permissionmanager.cpp b/src/common/permissionmanager.cpp
index 573e1d2..5510fd7 100644
--- a/src/common/permissionmanager.cpp
+++ b/src/common/permissionmanager.cpp
@@ -37,7 +37,7 @@ void addPermission(std::string permission, char mask)
     std::map<std::string, unsigned char>::iterator i = permissions.find(permission);
     if (i == permissions.end())
     {
-        permissions.insert(std::make_pair<std::string, unsigned char>(permission, mask));
+        permissions.insert(std::make_pair(permission, mask));
     } else {
         i->second |= mask;
     }