diff options
author | Markus Grüneis <gimpf@gimpf.org> | 2010-02-18 09:15:27 +0000 |
---|---|---|
committer | Markus Grüneis <gimpf@gimpf.org> | 2010-02-18 09:15:27 +0000 |
commit | e191eab68d905bfe14e3590a92fa653f0ae2ebce (patch) | |
tree | a5837b067ecab92c645008b537087b0d163ef1ab /src/connectionList.cpp | |
parent | whitespace only change: unified formatting with "astyle --style=k/r --indent=... (diff) |
non-functional changes only: use standard writing of stdint.h types; still import from boost (compiler compatibility)
Diffstat (limited to 'src/connectionList.cpp')
-rw-r--r-- | src/connectionList.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/connectionList.cpp b/src/connectionList.cpp index 2893dc2..4287a21 100644 --- a/src/connectionList.cpp +++ b/src/connectionList.cpp @@ -69,7 +69,7 @@ ConnectionList::~ConnectionList() // } } -void ConnectionList::addConnection(ConnectionParam& conn, u_int16_t mux) +void ConnectionList::addConnection(ConnectionParam& conn, uint16_t mux) { Lock lock(mutex_); @@ -103,7 +103,7 @@ ConnectionMap::iterator ConnectionList::getEndUnlocked() return connections_.end(); } -const ConnectionMap::iterator ConnectionList::getConnection(u_int16_t mux) +const ConnectionMap::iterator ConnectionList::getConnection(uint16_t mux) { Lock lock(mutex_); ConnectionMap::iterator it = connections_.find(mux); @@ -111,19 +111,19 @@ const ConnectionMap::iterator ConnectionList::getConnection(u_int16_t mux) } -ConnectionParam& ConnectionList::getOrNewConnectionUnlocked(u_int16_t mux) +ConnectionParam& ConnectionList::getOrNewConnectionUnlocked(uint16_t mux) { ConnectionMap::iterator it = connections_.find(mux); if(it!=connections_.end()) { return it->second; } - u_int8_t key[] = { + uint8_t key[] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p' }; - u_int8_t salt[] = { + uint8_t salt[] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n' }; |