summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOthmar Gsenger <otti@anytun.org>2008-12-11 14:52:19 +0000
committerOthmar Gsenger <otti@anytun.org>2008-12-11 14:52:19 +0000
commit90f60801f8508807b6d9b146a5e12bd42745edc0 (patch)
treee41b03d533d1666a349da49c07e94c8430690aa0 /src
parentmainly type and define fixes (diff)
some type fixes
Diffstat (limited to 'src')
-rw-r--r--src/connectionList.cpp4
-rw-r--r--src/routingTable.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/connectionList.cpp b/src/connectionList.cpp
index d272a03..a0d4abf 100644
--- a/src/connectionList.cpp
+++ b/src/connectionList.cpp
@@ -116,12 +116,12 @@ ConnectionParam & ConnectionList::getOrNewConnectionUnlocked(u_int16_t mux)
if(it!=connections_.end())
return it->second;
- uint8_t key[] = {
+ u_int8_t key[] = {
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p'
};
- uint8_t salt[] = {
+ u_int8_t salt[] = {
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
'i', 'j', 'k', 'l', 'm', 'n'
};
diff --git a/src/routingTable.cpp b/src/routingTable.cpp
index 409a5ab..e0641b1 100644
--- a/src/routingTable.cpp
+++ b/src/routingTable.cpp
@@ -104,10 +104,10 @@ u_int16_t* RoutingTable::getOrNewRoutingTEUnlocked(const NetworkPrefix & addr)
return &(it->second);
}
-uint16_t RoutingTable::getCountUnlocked()
+u_int16_t RoutingTable::getCountUnlocked()
{
RoutingMap::iterator it = routes_.begin();
- uint16_t routes=0;
+ u_int16_t routes=0;
for (;it!=routes_.end();++it)
routes++;
return routes;