summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ace/Future.cpp4
-rw-r--r--ace/SOCK_Dgram.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/ace/Future.cpp b/ace/Future.cpp
index a99d5f49460..173c56501ec 100644
--- a/ace/Future.cpp
+++ b/ace/Future.cpp
@@ -156,10 +156,10 @@ ACE_Future_Rep<T>::set (const T &r,
-1);
// Remove and notify all subscribed observers.
- OBSERVER_COLLECTION::iterator iterator =
+ ACE_TYPENAME OBSERVER_COLLECTION::iterator iterator =
this->observer_collection_.begin ();
- OBSERVER_COLLECTION::iterator end =
+ ACE_TYPENAME OBSERVER_COLLECTION::iterator end =
this->observer_collection_.end ();
for (;
diff --git a/ace/SOCK_Dgram.h b/ace/SOCK_Dgram.h
index f781ca7f66d..0573caadbc2 100644
--- a/ace/SOCK_Dgram.h
+++ b/ace/SOCK_Dgram.h
@@ -145,7 +145,7 @@ public:
ssize_t send (const void *buf,
size_t n,
const ACE_Addr &addr,
- int flags = 0,
+ int flags,
ACE_OVERLAPPED *overlapped,
ACE_OVERLAPPED_COMPLETION_FUNC func) const;
// Send an <n> byte <buf> to the datagram socket (uses <WSASentTo>).
@@ -153,7 +153,7 @@ public:
ssize_t recv (void *buf,
size_t n,
ACE_Addr &addr,
- int flags = 0,
+ int flags,
ACE_OVERLAPPED *overlapped,
ACE_OVERLAPPED_COMPLETION_FUNC func) const;
// Receive an <n> byte <buf> from the datagram socket (uses