summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormcorino <mcorino@users.noreply.github.com>2013-03-30 18:12:10 +0000
committermcorino <mcorino@users.noreply.github.com>2013-03-30 18:12:10 +0000
commit23e0e8e4cbdd0cbc8e25e49ffb6584ba8aa11f33 (patch)
tree3b8d00d72040407c874d7c2b0835aa69a6842f45
parent2da7b57b885a4bfcf2fa82094fcd7bd927e45db5 (diff)
downloadATCD-23e0e8e4cbdd0cbc8e25e49ffb6584ba8aa11f33.tar.gz
ChangeLogTag: Sat Mar 30 18:11:06 UTC 2013 Martin Corino <mcorino@remedy.nl>
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/examples/C++NPv1/Reactive_Logging_Server_Ex.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index d8a022775c7..565d91b75f2 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 30 18:11:06 UTC 2013 Martin Corino <mcorino@remedy.nl>
+
+ * examples/C++NPv1/Reactive_Logging_Server_Ex.h:
+ Fixed truncating cast error.
+
Sat Mar 30 09:44:50 UTC 2013 Martin Corino <mcorino@remedy.nl>
* ace/config-win32-mingw64.h:
diff --git a/ACE/examples/C++NPv1/Reactive_Logging_Server_Ex.h b/ACE/examples/C++NPv1/Reactive_Logging_Server_Ex.h
index 912d454840b..31f25498b7e 100644
--- a/ACE/examples/C++NPv1/Reactive_Logging_Server_Ex.h
+++ b/ACE/examples/C++NPv1/Reactive_Logging_Server_Ex.h
@@ -47,7 +47,7 @@ protected:
virtual int wait_for_multiple_events () {
active_read_handles_ = master_handle_set_;
- int width = ACE_Utils::truncate_cast<int> (active_read_handles_.max_set ()) + 1;
+ int width = ACE_Utils::truncate_cast<int> ((intptr_t)active_read_handles_.max_set ()) + 1;
return ACE::select (width, active_read_handles_);
}