Imported Upstream version 1.59.0

Change-Id: I2dde00f4eca71df3eea9d251dcaecde18a6c90a5
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

20 files changed, 101 insertions, 102 deletions

diff --git a/libs/serialization/src/archive_exception.cpp b/libs/serialization/src/archive_exception.cpp
index d06303f670..b850f89981 100644
--- a/libs/serialization/src/archive_exception.cpp
+++ b/libs/serialization/src/archive_exception.cpp
@@ -13,7 +13,6 @@
 #endif
 
 #include <exception>
-//#include <boost/assert.hpp>
 #include <string>
 
 #define BOOST_ARCHIVE_SOURCE
@@ -34,12 +33,12 @@ archive_exception::append(unsigned int l, const char * a){
     return l;
 }
 
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
+BOOST_ARCHIVE_DECL
 archive_exception::archive_exception(
     exception_code c, 
     const char * e1,
     const char * e2
-) : 
+) BOOST_NOEXCEPT :
     code(c)
 {
     unsigned int length = 0;
@@ -110,17 +109,16 @@ archive_exception::archive_exception(
         break;
     }
 }
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
-archive_exception::~archive_exception() throw() {}
+BOOST_ARCHIVE_DECL
+archive_exception::~archive_exception() BOOST_NOEXCEPT_OR_NOTHROW {}
 
-BOOST_ARCHIVE_DECL(const char *)
-archive_exception::what( ) const throw()
-{
+BOOST_ARCHIVE_DECL const char *
+archive_exception::what( ) const BOOST_NOEXCEPT_OR_NOTHROW {
     return m_buffer;
 }
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
-archive_exception::archive_exception() : 
-        code(no_exception)
+BOOST_ARCHIVE_DECL
+archive_exception::archive_exception() BOOST_NOEXCEPT :
+    code(no_exception)
 {}
 
 } // archive
diff --git a/libs/serialization/src/basic_archive.cpp b/libs/serialization/src/basic_archive.cpp
index 3f6c3e353d..1a7b57d1ff 100644
--- a/libs/serialization/src/basic_archive.cpp
+++ b/libs/serialization/src/basic_archive.cpp
@@ -41,7 +41,7 @@ namespace archive {
 // constants used in archive signature
 //This should never ever change. note that is not an std::string
 // string.
-BOOST_ARCHIVE_DECL(const char *) 
+BOOST_SYMBOL_VISIBLE const char * 
 BOOST_ARCHIVE_SIGNATURE(){
     return "serialization::archive";
 }
@@ -73,10 +73,11 @@ BOOST_ARCHIVE_SIGNATURE(){
 // 10- fixed base64 output/input.
 // 11- not changes
 // 12- improved serialization of collections
+// 13- simplified visibility, removed Borland, removed pfto
 
-BOOST_ARCHIVE_DECL(library_version_type)
+BOOST_SYMBOL_VISIBLE library_version_type
 BOOST_ARCHIVE_VERSION(){
-    return library_version_type(12);
+    return library_version_type(13);
 }
 
 } // namespace archive
diff --git a/libs/serialization/src/basic_iarchive.cpp b/libs/serialization/src/basic_iarchive.cpp
index 9e25092ae9..197cf67690 100644
--- a/libs/serialization/src/basic_iarchive.cpp
+++ b/libs/serialization/src/basic_iarchive.cpp
@@ -518,26 +518,26 @@ namespace boost {
 namespace archive {
 namespace detail {
 
-BOOST_ARCHIVE_DECL(void)
+BOOST_ARCHIVE_DECL void
 basic_iarchive::next_object_pointer(void *t){
     pimpl->next_object_pointer(t);
 }
 
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
+BOOST_ARCHIVE_DECL
 basic_iarchive::basic_iarchive(unsigned int flags) : 
     pimpl(new basic_iarchive_impl(flags))
 {}
 
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
+BOOST_ARCHIVE_DECL
 basic_iarchive::~basic_iarchive()
 {}
 
-BOOST_ARCHIVE_DECL(void)
+BOOST_ARCHIVE_DECL void
 basic_iarchive::set_library_version(library_version_type archive_library_version){
     pimpl->set_library_version(archive_library_version);
 }
 
-BOOST_ARCHIVE_DECL(void)
+BOOST_ARCHIVE_DECL void
 basic_iarchive::reset_object_address(
     const void * new_address, 
     const void * old_address
@@ -545,7 +545,7 @@ basic_iarchive::reset_object_address(
     pimpl->reset_object_address(new_address, old_address);
 }
 
-BOOST_ARCHIVE_DECL(void)
+BOOST_ARCHIVE_DECL void
 basic_iarchive::load_object(
     void *t, 
     const basic_iserializer & bis
@@ -554,7 +554,7 @@ basic_iarchive::load_object(
 }
 
 // load a pointer object
-BOOST_ARCHIVE_DECL(const basic_pointer_iserializer *)
+BOOST_ARCHIVE_DECL const basic_pointer_iserializer *
 basic_iarchive::load_pointer(
     void * &t, 
     const basic_pointer_iserializer * bpis_ptr,
@@ -566,23 +566,23 @@ basic_iarchive::load_pointer(
     return pimpl->load_pointer(*this, t, bpis_ptr, finder);
 }
 
-BOOST_ARCHIVE_DECL(void)
+BOOST_ARCHIVE_DECL void
 basic_iarchive::register_basic_serializer(const basic_iserializer & bis){
     pimpl->register_type(bis);
 }
 
-BOOST_ARCHIVE_DECL(void)
+BOOST_ARCHIVE_DECL void
 basic_iarchive::delete_created_pointers()
 {
     pimpl->delete_created_pointers();
 }
 
-BOOST_ARCHIVE_DECL(boost::archive::library_version_type) 
+BOOST_ARCHIVE_DECL boost::archive::library_version_type
 basic_iarchive::get_library_version() const{
     return pimpl->m_archive_library_version;
 }
 
-BOOST_ARCHIVE_DECL(unsigned int) 
+BOOST_ARCHIVE_DECL unsigned int
 basic_iarchive::get_flags() const{
     return pimpl->m_flags;
 }
diff --git a/libs/serialization/src/basic_iserializer.cpp b/libs/serialization/src/basic_iserializer.cpp
index e18e16fe50..2b273927c2 100644
--- a/libs/serialization/src/basic_iserializer.cpp
+++ b/libs/serialization/src/basic_iserializer.cpp
@@ -17,7 +17,7 @@ namespace boost {
 namespace archive {
 namespace detail {
 
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) 
+BOOST_ARCHIVE_DECL 
 basic_iserializer::basic_iserializer(
     const boost::serialization::extended_type_info & eti
 ) :
@@ -25,7 +25,7 @@ basic_iserializer::basic_iserializer(
     m_bpis(NULL)
 {}
 
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) 
+BOOST_ARCHIVE_DECL 
 basic_iserializer::~basic_iserializer(){}
 
 } // namespace detail
diff --git a/libs/serialization/src/basic_oarchive.cpp b/libs/serialization/src/basic_oarchive.cpp
index 2ce98c6d55..c99baeb424 100644
--- a/libs/serialization/src/basic_oarchive.cpp
+++ b/libs/serialization/src/basic_oarchive.cpp
@@ -410,16 +410,16 @@ namespace boost {
 namespace archive {
 namespace detail {
 
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) 
+BOOST_ARCHIVE_DECL 
 basic_oarchive::basic_oarchive(unsigned int flags)
     : pimpl(new basic_oarchive_impl(flags))
 {}
 
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) 
+BOOST_ARCHIVE_DECL 
 basic_oarchive::~basic_oarchive()
 {}
 
-BOOST_ARCHIVE_DECL(void) 
+BOOST_ARCHIVE_DECL void 
 basic_oarchive::save_object(
     const void *x, 
     const basic_oserializer & bos
@@ -427,7 +427,7 @@ basic_oarchive::save_object(
     pimpl->save_object(*this, x, bos);
 }
 
-BOOST_ARCHIVE_DECL(void) 
+BOOST_ARCHIVE_DECL void 
 basic_oarchive::save_pointer(
     const void * t, 
     const basic_pointer_oserializer * bpos_ptr
@@ -435,22 +435,22 @@ basic_oarchive::save_pointer(
     pimpl->save_pointer(*this, t, bpos_ptr);
 }
 
-BOOST_ARCHIVE_DECL(void) 
+BOOST_ARCHIVE_DECL void 
 basic_oarchive::register_basic_serializer(const basic_oserializer & bos){
     pimpl->register_type(bos);
 }
 
-BOOST_ARCHIVE_DECL(library_version_type)
+BOOST_ARCHIVE_DECL library_version_type
 basic_oarchive::get_library_version() const{
     return BOOST_ARCHIVE_VERSION();
 }
 
-BOOST_ARCHIVE_DECL(unsigned int)
+BOOST_ARCHIVE_DECL unsigned int
 basic_oarchive::get_flags() const{
     return pimpl->m_flags;
 }
 
-BOOST_ARCHIVE_DECL(void) 
+BOOST_ARCHIVE_DECL void 
 basic_oarchive::end_preamble(){
 }
 
diff --git a/libs/serialization/src/basic_oserializer.cpp b/libs/serialization/src/basic_oserializer.cpp
index 0e21806454..70b1106b3e 100644
--- a/libs/serialization/src/basic_oserializer.cpp
+++ b/libs/serialization/src/basic_oserializer.cpp
@@ -17,7 +17,7 @@ namespace boost {
 namespace archive {
 namespace detail {
 
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) 
+BOOST_ARCHIVE_DECL 
 basic_oserializer::basic_oserializer(
         const boost::serialization::extended_type_info & eti
 ) :
@@ -25,7 +25,7 @@ basic_oserializer::basic_oserializer(
     m_bpos(NULL)
 {}
 
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) 
+BOOST_ARCHIVE_DECL 
 basic_oserializer::~basic_oserializer(){}
 
 } // namespace detail
diff --git a/libs/serialization/src/basic_pointer_iserializer.cpp b/libs/serialization/src/basic_pointer_iserializer.cpp
index fac766fdef..6edf4510ce 100644
--- a/libs/serialization/src/basic_pointer_iserializer.cpp
+++ b/libs/serialization/src/basic_pointer_iserializer.cpp
@@ -15,14 +15,14 @@ namespace boost {
 namespace archive {
 namespace detail {
 
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) 
+BOOST_ARCHIVE_DECL 
 basic_pointer_iserializer::basic_pointer_iserializer(
     const boost::serialization::extended_type_info & eti
 ) :
     basic_serializer(eti)
 {}
 
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) 
+BOOST_ARCHIVE_DECL 
 basic_pointer_iserializer::~basic_pointer_iserializer() {}
 
 } // namespace detail
diff --git a/libs/serialization/src/basic_pointer_oserializer.cpp b/libs/serialization/src/basic_pointer_oserializer.cpp
index 9e9f1dd15f..a5fc65c1b2 100644
--- a/libs/serialization/src/basic_pointer_oserializer.cpp
+++ b/libs/serialization/src/basic_pointer_oserializer.cpp
@@ -15,14 +15,14 @@ namespace boost {
 namespace archive {
 namespace detail {
 
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) 
+BOOST_ARCHIVE_DECL 
 basic_pointer_oserializer::basic_pointer_oserializer(
     const boost::serialization::extended_type_info & eti
 ) :
     basic_serializer(eti)
 {}
 
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) 
+BOOST_ARCHIVE_DECL 
 basic_pointer_oserializer::~basic_pointer_oserializer() {}
 
 } // namespace detail
diff --git a/libs/serialization/src/basic_serializer_map.cpp b/libs/serialization/src/basic_serializer_map.cpp
index 7df0b3ddc3..fea50a6d30 100644
--- a/libs/serialization/src/basic_serializer_map.cpp
+++ b/libs/serialization/src/basic_serializer_map.cpp
@@ -40,7 +40,7 @@ basic_serializer_map::type_info_pointer_compare::operator()(
     return *lhs < *rhs;
 }
 
-BOOST_ARCHIVE_DECL(bool) 
+BOOST_ARCHIVE_DECL bool
 basic_serializer_map::insert(const basic_serializer * bs){
     // attempt to insert serializer into it's map
     // the following is commented out - rather than being just
@@ -72,7 +72,7 @@ basic_serializer_map::insert(const basic_serializer * bs){
     return true;
 }
 
-BOOST_ARCHIVE_DECL(void) 
+BOOST_ARCHIVE_DECL void 
 basic_serializer_map::erase(const basic_serializer * bs){
     map_type::iterator it = m_map.begin();
     map_type::iterator it_end = m_map.end();
@@ -92,7 +92,7 @@ basic_serializer_map::erase(const basic_serializer * bs){
     //if(*it == bs)
     //    m_map.erase(it);
 }
-BOOST_ARCHIVE_DECL(const basic_serializer *)
+BOOST_ARCHIVE_DECL const basic_serializer *
 basic_serializer_map::find(
     const boost::serialization::extended_type_info & eti
 ) const {
diff --git a/libs/serialization/src/basic_xml_archive.cpp b/libs/serialization/src/basic_xml_archive.cpp
index e71aaef39c..3d846633c5 100644
--- a/libs/serialization/src/basic_xml_archive.cpp
+++ b/libs/serialization/src/basic_xml_archive.cpp
@@ -14,35 +14,35 @@
 namespace boost {
 namespace archive {
 
-BOOST_ARCHIVE_DECL(const char *)
+BOOST_SYMBOL_VISIBLE const char *
 BOOST_ARCHIVE_XML_OBJECT_ID(){
     return "object_id";
 }
-BOOST_ARCHIVE_DECL(const char *)
+BOOST_SYMBOL_VISIBLE const char *
 BOOST_ARCHIVE_XML_OBJECT_REFERENCE(){
     return "object_id_reference";
 }
-BOOST_ARCHIVE_DECL(const char *)
+BOOST_SYMBOL_VISIBLE const char *
 BOOST_ARCHIVE_XML_CLASS_ID(){
     return "class_id";
 }
-BOOST_ARCHIVE_DECL(const char *)
+BOOST_SYMBOL_VISIBLE const char *
 BOOST_ARCHIVE_XML_CLASS_ID_REFERENCE(){
     return "class_id_reference";
 }
-BOOST_ARCHIVE_DECL(const char *)
+BOOST_SYMBOL_VISIBLE const char *
 BOOST_ARCHIVE_XML_CLASS_NAME(){
     return "class_name";
 }
-BOOST_ARCHIVE_DECL(const char *)
+BOOST_SYMBOL_VISIBLE const char *
 BOOST_ARCHIVE_XML_TRACKING(){
     return "tracking_level";
 }
-BOOST_ARCHIVE_DECL(const char *)
+BOOST_SYMBOL_VISIBLE const char *
 BOOST_ARCHIVE_XML_VERSION(){
     return "version";
 }
-BOOST_ARCHIVE_DECL(const char *)
+BOOST_SYMBOL_VISIBLE const char *
 BOOST_ARCHIVE_XML_SIGNATURE(){
     return "signature";
 }
diff --git a/libs/serialization/src/basic_xml_grammar.ipp b/libs/serialization/src/basic_xml_grammar.ipp
index 28be525ca3..c7b500a1ef 100644
--- a/libs/serialization/src/basic_xml_grammar.ipp
+++ b/libs/serialization/src/basic_xml_grammar.ipp
@@ -14,11 +14,11 @@
 
 #include <istream>
 #include <algorithm>
-#include <boost/config.hpp> // BOOST_DEDUCED_TYPENAME
+#include <boost/config.hpp> // typename
 
 #ifdef BOOST_MSVC
 #  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
+#  pragma warning(disable : 4244 4511 4512)
 #endif
 
 // spirit stuff
@@ -33,7 +33,6 @@
 // for head_iterator test
 //#include <boost/bind.hpp> 
 #include <boost/function.hpp>
-#include <boost/serialization/pfto.hpp>
 
 #include <boost/io/ios_state.hpp>
 #include <boost/serialization/throw_exception.hpp>
@@ -146,7 +145,7 @@ template<class String>
 struct append_char {
     String & contents;
     void operator()(const unsigned int char_value) const {
-        const BOOST_DEDUCED_TYPENAME String::value_type z = char_value;
+        const typename String::value_type z = char_value;
         contents += z;
     }
     append_char(String & contents_)
@@ -159,7 +158,7 @@ struct append_lit {
     String & contents;
     template<class X, class Y>
     void operator()(const X & /*x*/, const Y & /*y*/) const {
-        const BOOST_DEDUCED_TYPENAME String::value_type z = c;
+        const typename String::value_type z = c;
         contents += z;
     }
     append_lit(String & contents_)
@@ -175,7 +174,7 @@ struct append_lit {
 
 template<class CharType>
 bool basic_xml_grammar<CharType>::my_parse(
-    BOOST_DEDUCED_TYPENAME basic_xml_grammar<CharType>::IStream & is,
+    typename basic_xml_grammar<CharType>::IStream & is,
     const rule_t & rule_,
     CharType delimiter
 ) const {
@@ -192,7 +191,7 @@ bool basic_xml_grammar<CharType>::my_parse(
     
     CharType val;
     do{
-        BOOST_DEDUCED_TYPENAME basic_xml_grammar<CharType>::IStream::int_type
+        typename basic_xml_grammar<CharType>::IStream::int_type
             result = is.get();
         if(is.fail())
             return false;
@@ -206,14 +205,14 @@ bool basic_xml_grammar<CharType>::my_parse(
     // is terminated.  This will permit the archive to be used for debug
     // and transaction data logging in the standard way.
     
-    parse_info<BOOST_DEDUCED_TYPENAME std::basic_string<CharType>::iterator> 
+    parse_info<typename std::basic_string<CharType>::iterator> 
         result = boost::spirit::classic::parse(arg.begin(), arg.end(), rule_);
     return result.hit;
 }
 
 template<class CharType>
 bool basic_xml_grammar<CharType>::parse_start_tag(
-    BOOST_DEDUCED_TYPENAME basic_xml_grammar<CharType>::IStream & is
+    typename basic_xml_grammar<CharType>::IStream & is
 ){
     rv.class_name.resize(0);
     return my_parse(is, STag);
@@ -283,7 +282,7 @@ basic_xml_grammar<CharType>::basic_xml_grammar(){
         CharDataChars [
             xml::append_string<
                 StringType, 
-                BOOST_DEDUCED_TYPENAME std::basic_string<CharType>::const_iterator
+                typename std::basic_string<CharType>::const_iterator
             >(rv.contents)
         ]
     ;
diff --git a/libs/serialization/src/codecvt_null.cpp b/libs/serialization/src/codecvt_null.cpp
index 80ba2a3327..86ece4ad94 100644
--- a/libs/serialization/src/codecvt_null.cpp
+++ b/libs/serialization/src/codecvt_null.cpp
@@ -17,7 +17,7 @@
 namespace boost {
 namespace archive {
 
-BOOST_WARCHIVE_DECL(std::codecvt_base::result)
+BOOST_WARCHIVE_DECL std::codecvt_base::result
 codecvt_null<wchar_t>::do_out(
     std::mbstate_t & /*state*/,
     const wchar_t * first1, 
@@ -45,7 +45,7 @@ codecvt_null<wchar_t>::do_out(
     return std::codecvt_base::ok;
 }
 
-BOOST_WARCHIVE_DECL(std::codecvt_base::result)
+BOOST_WARCHIVE_DECL std::codecvt_base::result
 codecvt_null<wchar_t>::do_in(
     std::mbstate_t & /*state*/,
     const char * first1, 
diff --git a/libs/serialization/src/extended_type_info.cpp b/libs/serialization/src/extended_type_info.cpp
index 48bbc56273..1c6aa31719 100644
--- a/libs/serialization/src/extended_type_info.cpp
+++ b/libs/serialization/src/extended_type_info.cpp
@@ -110,14 +110,14 @@ public:
 
 } // namespace detail
 
-BOOST_SERIALIZATION_DECL(void)  
+BOOST_SERIALIZATION_DECL void  
 extended_type_info::key_register() const{
     if(NULL == get_key())
         return;
     singleton<detail::ktmap>::get_mutable_instance().insert(this);
 }
 
-BOOST_SERIALIZATION_DECL(void)  
+BOOST_SERIALIZATION_DECL void  
 extended_type_info::key_unregister() const{
     if(NULL == get_key())
         return;
@@ -135,7 +135,7 @@ extended_type_info::key_unregister() const{
     }
 }
 
-BOOST_SERIALIZATION_DECL(const extended_type_info *) 
+BOOST_SERIALIZATION_DECL const extended_type_info *
 extended_type_info::find(const char *key) {
     BOOST_ASSERT(NULL != key);
     const detail::ktmap & k = singleton<detail::ktmap>::get_const_instance();
@@ -146,7 +146,7 @@ extended_type_info::find(const char *key) {
     return *(it);
 }
 
-BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
+BOOST_SERIALIZATION_DECL
 extended_type_info::extended_type_info(
     const unsigned int type_info_key,
     const char * key
@@ -156,11 +156,11 @@ extended_type_info::extended_type_info(
 {
 }
 
-BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY()) 
+BOOST_SERIALIZATION_DECL 
 extended_type_info::~extended_type_info(){
 }
 
-BOOST_SERIALIZATION_DECL(bool)  
+BOOST_SERIALIZATION_DECL bool
 extended_type_info::operator<(const extended_type_info &rhs) const {
     // short cut for a common cases
     if(this == & rhs)
@@ -173,7 +173,7 @@ extended_type_info::operator<(const extended_type_info &rhs) const {
     return false;
 }
 
-BOOST_SERIALIZATION_DECL(bool)
+BOOST_SERIALIZATION_DECL bool
 extended_type_info::operator==(const extended_type_info &rhs) const {
     // short cut for a common cases
     if(this == & rhs)
diff --git a/libs/serialization/src/extended_type_info_no_rtti.cpp b/libs/serialization/src/extended_type_info_no_rtti.cpp
index 3b2a888459..32d0437eea 100644
--- a/libs/serialization/src/extended_type_info_no_rtti.cpp
+++ b/libs/serialization/src/extended_type_info_no_rtti.cpp
@@ -27,14 +27,14 @@ namespace boost {
 namespace serialization { 
 namespace no_rtti_system { 
 
-BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())  
+BOOST_SERIALIZATION_DECL  
 extended_type_info_no_rtti_0::extended_type_info_no_rtti_0(
     const char * key
 ) :
     extended_type_info(EXTENDED_TYPE_INFO_NO_RTTI_KEY, key)
 {}
 
-BOOST_SERIALIZATION_DECL(bool)
+BOOST_SERIALIZATION_DECL bool
 extended_type_info_no_rtti_0::is_less_than(
     const boost::serialization::extended_type_info &rhs) const 
 {
@@ -57,7 +57,7 @@ extended_type_info_no_rtti_0::is_less_than(
     return std::strcmp(l, r) < 0;
 }
 
-BOOST_SERIALIZATION_DECL(bool)
+BOOST_SERIALIZATION_DECL bool
 extended_type_info_no_rtti_0::is_equal(
     const boost::serialization::extended_type_info &rhs) const 
 {
@@ -76,7 +76,7 @@ extended_type_info_no_rtti_0::is_equal(
     return 0 == std::strcmp(l, r);
 }
 
-BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())  
+BOOST_SERIALIZATION_DECL  
 extended_type_info_no_rtti_0::~extended_type_info_no_rtti_0()
 {}
 
diff --git a/libs/serialization/src/extended_type_info_typeid.cpp b/libs/serialization/src/extended_type_info_typeid.cpp
index 8d970309e4..36be277bd5 100644
--- a/libs/serialization/src/extended_type_info_typeid.cpp
+++ b/libs/serialization/src/extended_type_info_typeid.cpp
@@ -44,7 +44,7 @@ typedef std::multiset<
     type_compare
 > tkmap;
     
-BOOST_SERIALIZATION_DECL(bool) 
+BOOST_SERIALIZATION_DECL bool
 extended_type_info_typeid_0::is_less_than(
     const boost::serialization::extended_type_info & rhs
 ) const {
@@ -56,7 +56,7 @@ extended_type_info_typeid_0::is_less_than(
     );
 }
 
-BOOST_SERIALIZATION_DECL(bool) 
+BOOST_SERIALIZATION_DECL bool
 extended_type_info_typeid_0::is_equal(
     const boost::serialization::extended_type_info & rhs
 ) const {
@@ -70,7 +70,7 @@ extended_type_info_typeid_0::is_equal(
     ;
 }
 
-BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
+BOOST_SERIALIZATION_DECL
 extended_type_info_typeid_0::extended_type_info_typeid_0(
     const char * key
 ) :
@@ -78,17 +78,17 @@ extended_type_info_typeid_0::extended_type_info_typeid_0(
     m_ti(NULL)
 {}
 
-BOOST_SERIALIZATION_DECL(BOOST_PP_EMPTY())
+BOOST_SERIALIZATION_DECL
 extended_type_info_typeid_0::~extended_type_info_typeid_0()
 {}
 
-BOOST_SERIALIZATION_DECL(void) 
+BOOST_SERIALIZATION_DECL void 
 extended_type_info_typeid_0::type_register(const std::type_info & ti){
     m_ti = & ti;
     singleton<tkmap>::get_mutable_instance().insert(this);
 }
 
-BOOST_SERIALIZATION_DECL(void) 
+BOOST_SERIALIZATION_DECL void 
 extended_type_info_typeid_0::type_unregister()
 {
     if(NULL != m_ti){
@@ -144,7 +144,7 @@ public:
 #  pragma warning(pop)
 #endif
 
-BOOST_SERIALIZATION_DECL(const extended_type_info *)
+BOOST_SERIALIZATION_DECL const extended_type_info *
 extended_type_info_typeid_0::get_extended_type_info(
     const std::type_info & ti
 ) const {
diff --git a/libs/serialization/src/stl_port.cpp b/libs/serialization/src/stl_port.cpp
index e5378bca4b..343faa6d16 100644
--- a/libs/serialization/src/stl_port.cpp
+++ b/libs/serialization/src/stl_port.cpp
@@ -13,8 +13,7 @@
 #endif
 
 // this befuddles the msvc 6 compiler so we can't use it
-#if ! ((defined _MSC_VER) && (_MSC_VER <= 1300)) \
-&&  ! defined(__BORLANDC__)
+#if ! ((defined _MSC_VER) && (_MSC_VER <= 1300)) 
 
 #include <boost/config.hpp>
 
diff --git a/libs/serialization/src/void_cast.cpp b/libs/serialization/src/void_cast.cpp
index df31235f41..8ea5595e48 100644
--- a/libs/serialization/src/void_cast.cpp
+++ b/libs/serialization/src/void_cast.cpp
@@ -27,6 +27,7 @@
 
 // BOOST
 #define BOOST_SERIALIZATION_SOURCE
+#include <boost/serialization/config.hpp>
 #include <boost/serialization/singleton.hpp>
 #include <boost/serialization/extended_type_info.hpp>
 #include <boost/serialization/void_cast.hpp>
@@ -212,7 +213,7 @@ public:
 #endif
 
 // implementation of void caster base class
-BOOST_SERIALIZATION_DECL(void)
+BOOST_SERIALIZATION_DECL void
 void_caster::recursive_register(bool includes_virtual_base) const {
     void_cast_detail::set_type & s
         = void_cast_detail::void_caster_registry::get_mutable_instance();
@@ -270,7 +271,7 @@ void_caster::recursive_register(bool includes_virtual_base) const {
     }
 }
 
-BOOST_SERIALIZATION_DECL(void)
+BOOST_SERIALIZATION_DECL void
 void_caster::recursive_unregister() const {
     if(void_caster_registry::is_destroyed())
         return;
@@ -306,11 +307,18 @@ void_caster::recursive_unregister() const {
 
 } // namespace void_cast_detail
 
+BOOST_SYMBOL_VISIBLE void const *
+void_upcast(
+    extended_type_info const & derived,
+    extended_type_info const & base,
+    void const * const t
+);
+
 // Given a void *, assume that it really points to an instance of one type
 // and alter it so that it would point to an instance of a related type.
 // Return the altered pointer. If there exists no sequence of casts that
 // can transform from_type to to_type, return a NULL.  
-BOOST_SERIALIZATION_DECL(void const *)  
+BOOST_SERIALIZATION_DECL void const *
 void_upcast(
     extended_type_info const & derived,
     extended_type_info const & base,
@@ -333,7 +341,14 @@ void_upcast(
     return NULL;
 }
 
-BOOST_SERIALIZATION_DECL(void const *)  
+BOOST_SYMBOL_VISIBLE void const *
+void_downcast(
+    extended_type_info const & derived,
+    extended_type_info const & base,
+    void const * const t
+);
+
+BOOST_SERIALIZATION_DECL void const *
 void_downcast(
     extended_type_info const & derived,
     extended_type_info const & base,
diff --git a/libs/serialization/src/xml_archive_exception.cpp b/libs/serialization/src/xml_archive_exception.cpp
index 41d33fdaba..c1431e27e7 100644
--- a/libs/serialization/src/xml_archive_exception.cpp
+++ b/libs/serialization/src/xml_archive_exception.cpp
@@ -23,7 +23,7 @@
 namespace boost {
 namespace archive {
 
-BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
+BOOST_ARCHIVE_DECL
 xml_archive_exception::xml_archive_exception(
         exception_code c, 
         const char * e1,
diff --git a/libs/serialization/src/xml_iarchive.cpp b/libs/serialization/src/xml_iarchive.cpp
index 4311893553..4fe65bad08 100644
--- a/libs/serialization/src/xml_iarchive.cpp
+++ b/libs/serialization/src/xml_iarchive.cpp
@@ -14,14 +14,8 @@
 
 #define BOOST_ARCHIVE_SOURCE
 
-// the following works around an issue between spirit 1.61 and borland.
-// it turns out the the certain spirit stuff must be defined before
-// certain parts of mpl.  including this here makes sure that happens
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
-#if BOOST_WORKAROUND(__BORLANDC__, <= 0x560 )
-#include <boost/archive/impl/basic_xml_grammar.hpp>
-#endif
 
 #include <boost/archive/xml_iarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
diff --git a/libs/serialization/src/xml_wiarchive.cpp b/libs/serialization/src/xml_wiarchive.cpp
index 02665488ab..704ddb0750 100644
--- a/libs/serialization/src/xml_wiarchive.cpp
+++ b/libs/serialization/src/xml_wiarchive.cpp
@@ -21,13 +21,6 @@
 
 #define BOOST_WARCHIVE_SOURCE
 
-// the following works around an issue between spirit 1.61 and borland.
-// it turns out the the certain spirit stuff must be defined before
-// certain parts of mpl.  including this here makes sure that happens
-#if BOOST_WORKAROUND(__BORLANDC__, <= 0x560 )
-#include <boost/archive/impl/basic_xml_grammar.hpp>
-#endif
-
 #include <boost/archive/xml_wiarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>