summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-08-09 06:38:18 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-08-09 06:38:18 +0000
commit24846517a7c7ac3eb94e4ef2cb7399ab5e72bd7b (patch)
tree687bf058dbb2efbe142c65f7de08d92a23caf362
parent2cfa8785fd029d0564302322c3d0f9532ae60a57 (diff)
downloadATCD-24846517a7c7ac3eb94e4ef2cb7399ab5e72bd7b.tar.gz
Mon Aug 9 06:38:34 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-sunos5.5.h: Fixed compile error
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/ace/SV_Semaphore_Complex.cpp2
-rw-r--r--ACE/ace/config-sunos5.5.h1
3 files changed, 5 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index cefb92e0b8c..0594dc57ff8 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 9 06:38:34 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/config-sunos5.5.h:
+ Fixed compile error
+
Mon Aug 9 06:35:14 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/ace.mpc:
diff --git a/ACE/ace/SV_Semaphore_Complex.cpp b/ACE/ace/SV_Semaphore_Complex.cpp
index d23e3193e50..14f35f68373 100644
--- a/ACE/ace/SV_Semaphore_Complex.cpp
+++ b/ACE/ace/SV_Semaphore_Complex.cpp
@@ -8,8 +8,6 @@
#include "ace/SV_Semaphore_Complex.inl"
#endif /* __ACE_INLINE__ */
-
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE(ACE_SV_Semaphore_Complex)
diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h
index 793a1ed4195..fc3023dddde 100644
--- a/ACE/ace/config-sunos5.5.h
+++ b/ACE/ace/config-sunos5.5.h
@@ -64,7 +64,6 @@
# define ACE_HAS_THR_C_DEST
# endif /* __SUNPRO_CC_COMPAT >= 5 */
# define ACE_HAS_NEW_NOTHROW
-# endif
# elif (__SUNPRO_CC == 0x420) || (__SUNPRO_CC == 0x410)
# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
# endif /* __SUNPRO_CC >= 0x500 */