diff options
| -rw-r--r-- | ACE/ChangeLog | 13 | ||||
| -rw-r--r-- | ACE/ace/Truncate.h | 40 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/acexml.mpb | 2 |
3 files changed, 34 insertions, 21 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 6be177cba3f..b8c341ac2db 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,16 @@ +Tue Oct 24 17:46:40 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/Truncate.h (Truncator): + + Export the Borland-specific specializations from the DLL. This + should address the "undefined symbol" link-time problem. + + * bin/MakeProjectCreator/config/acexml.mpb: + + Re-disabled ACEXML when ace_for_tao is enabled. ACEXML needs + the ACE_Configuration and memory map classes that are not found + in the ace_for_tao subset. + Tue Oct 24 14:44:09 UTC 2006 Olli Savia <ops@iki.fi> * ace/TTY_IO.cpp: diff --git a/ACE/ace/Truncate.h b/ACE/ace/Truncate.h index 31b3c966aa6..5e4271ef835 100644 --- a/ACE/ace/Truncate.h +++ b/ACE/ace/Truncate.h @@ -507,7 +507,7 @@ namespace ACE_Utils //---------------------------------------------------------- template<> - struct Truncator<ACE_INT32, ACE_INT8> + struct ACE_Export Truncator<ACE_INT32, ACE_INT8> { static ACE_INT8 truncate (ACE_INT32 val) { @@ -519,7 +519,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_UINT32, ACE_UINT8> + struct ACE_Export Truncator<ACE_UINT32, ACE_UINT8> { static ACE_UINT8 truncate (ACE_UINT32 val) { @@ -531,7 +531,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_INT32, ACE_UINT8> + struct ACE_Export Truncator<ACE_INT32, ACE_UINT8> { static ACE_UINT8 truncate (ACE_INT32 val) { @@ -543,7 +543,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_UINT32, ACE_INT8> + struct ACE_Export Truncator<ACE_UINT32, ACE_INT8> { static ACE_INT8 truncate (ACE_UINT32 val) { @@ -555,7 +555,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_INT64, ACE_INT32> + struct ACE_Export Truncator<ACE_INT64, ACE_INT32> { static ACE_INT32 truncate (ACE_INT64 val) { @@ -567,7 +567,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_INT64, ACE_UINT32> + struct ACE_Export Truncator<ACE_INT64, ACE_UINT32> { static ACE_UINT32 truncate (ACE_INT64 val) { @@ -579,7 +579,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_UINT64, ACE_UINT32> + struct ACE_Export Truncator<ACE_UINT64, ACE_UINT32> { static ACE_UINT32 truncate (ACE_UINT64 val) { @@ -591,7 +591,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_UINT64, ACE_INT32> + struct ACE_Export Truncator<ACE_UINT64, ACE_INT32> { static ACE_INT32 truncate (ACE_UINT64 val) { @@ -607,7 +607,7 @@ namespace ACE_Utils //---------------------------------------------------------- template<> - struct Truncator<ACE_INT32, ACE_UINT32> + struct ACE_Export Truncator<ACE_INT32, ACE_UINT32> { static ACE_UINT32 truncate (ACE_INT32 val) { @@ -616,7 +616,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_UINT32, ACE_INT32> + struct ACE_Export Truncator<ACE_UINT32, ACE_INT32> { static ACE_INT32 truncate (ACE_UINT32 val) { @@ -628,7 +628,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_INT64, ACE_UINT64> + struct ACE_Export Truncator<ACE_INT64, ACE_UINT64> { static ACE_UINT64 truncate (ACE_INT64 val) { @@ -637,7 +637,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_UINT64, ACE_INT64> + struct ACE_Export Truncator<ACE_UINT64, ACE_INT64> { static ACE_INT64 truncate (ACE_UINT64 val) { @@ -653,7 +653,7 @@ namespace ACE_Utils //---------------------------------------------------------- template<> - struct Truncator<ACE_INT8, ACE_INT32> + struct ACE_Export Truncator<ACE_INT8, ACE_INT32> { static ACE_INT32 truncate (ACE_INT8 val) { @@ -662,7 +662,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_UINT8, ACE_UINT32> + struct ACE_Export Truncator<ACE_UINT8, ACE_UINT32> { static ACE_UINT32 truncate (ACE_UINT8 val) { @@ -671,7 +671,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_UINT8, ACE_INT32> + struct ACE_Export Truncator<ACE_UINT8, ACE_INT32> { static ACE_INT32 truncate (ACE_UINT8 val) { @@ -680,7 +680,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_INT8, ACE_UINT32> + struct ACE_Export Truncator<ACE_INT8, ACE_UINT32> { static ACE_UINT32 truncate (ACE_INT8 val) { @@ -689,7 +689,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_INT32, ACE_INT64> + struct ACE_Export Truncator<ACE_INT32, ACE_INT64> { static ACE_INT64 truncate (ACE_INT32 val) { @@ -698,7 +698,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_INT32, ACE_UINT64> + struct ACE_Export Truncator<ACE_INT32, ACE_UINT64> { static ACE_UINT64 truncate (ACE_INT32 val) { @@ -707,7 +707,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_UINT32, ACE_UINT64> + struct ACE_Export Truncator<ACE_UINT32, ACE_UINT64> { static ACE_UINT64 truncate (ACE_UINT32 val) { @@ -716,7 +716,7 @@ namespace ACE_Utils }; template<> - struct Truncator<ACE_UINT32, ACE_INT64> + struct ACE_Export Truncator<ACE_UINT32, ACE_INT64> { static ACE_INT64 truncate (ACE_UINT32 val) { diff --git a/ACE/bin/MakeProjectCreator/config/acexml.mpb b/ACE/bin/MakeProjectCreator/config/acexml.mpb index de23c158c18..7097de92b92 100644 --- a/ACE/bin/MakeProjectCreator/config/acexml.mpb +++ b/ACE/bin/MakeProjectCreator/config/acexml.mpb @@ -2,7 +2,7 @@ // $Id$ project { -// avoids += ace_for_tao + avoids += ace_for_tao after += ACEXML_Parser ACEXML libs += ACEXML_Parser ACEXML includes += $(ACE_ROOT)/ACEXML/common |