summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-08-25 11:17:46 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-08-25 11:17:46 +0000
commitc9717f2c677add478f1d9c773d1b814c0dfa1ba0 (patch)
treeee686c92692702fc3ae2350c8a69b22009769811
parentc84c78e2d8d58d9edc76d6385ac725d601c9409b (diff)
downloadATCD-c9717f2c677add478f1d9c773d1b814c0dfa1ba0.tar.gz
Fri Aug 24 11:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/ace/CDR_Size.cpp1
2 files changed, 6 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index e8bbbbf2abe..1da42661667 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 24 11:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/CDR_Size.cpp:
+ Added include of OS_Memory.h to get ACE_align_binary
+
Thu Aug 24 21:40:24 UTC 2006 Steve Huston <shuston@riverace.com>
* tests/Process_Manual_Event_Test.cpp (acquire_release): Fixed a race
diff --git a/ACE/ace/CDR_Size.cpp b/ACE/ace/CDR_Size.cpp
index 8265881b670..a6961804384 100644
--- a/ACE/ace/CDR_Size.cpp
+++ b/ACE/ace/CDR_Size.cpp
@@ -1,5 +1,6 @@
#include "ace/CDR_Size.h"
#include "ace/SString.h"
+#include "ace/OS_Memory.h"
#if !defined (__ACE_INLINE__)
# include "ace/CDR_Size.inl"