Changeset 10799

Show
Ignore:
Timestamp:
07/28/11 13:19:41 (22 months ago)
Author:
mcarrick
Message:

removing explicit support for previous versions of boost (1.35, 1.37); support for old versions will cause the code to be seriously fragmented

Location:
ossiedev/branches/mcarrick/ossiedev/system/ossie/framework
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • ossiedev/branches/mcarrick/ossiedev/system/ossie/framework/FileManager_impl.cpp

    r10798 r10799  
    2727#include <boost/filesystem/exception.hpp> 
    2828#include <boost/filesystem/operations.hpp> 
     29#include <boost/cerrno.hpp> 
    2930 
    3031#ifndef BOOST_VERSION 
    … …  
    3233#endif 
    3334 
    34 #if BOOST_VERSION < 103500 
    35 #  include <boost/filesystem/cerrno.hpp> 
    36 #else 
    37 #  include <boost/cerrno.hpp> 
    38 #endif 
    3935 
    4036namespace fs = boost::filesystem; 
    … …  
    347343        return result._retn(); 
    348344    } catch (const fs::filesystem_error &ex) { 
    349 #if BOOST_VERSION < 103400 
    350         DEBUG(9, FileManager, "Caught exception in list, error_code " << ex.error()); 
    351         if (ex.error() == fs::other_error) 
    352 #elif BOOST_VERSION < 103500 
    353         DEBUG(9, FileManager, "Caught exception in list, error_code " << ex.system_error()); 
    354         if (ex.system_error() == EINVAL) 
    355 #else 
    356345        DEBUG(9, FileManager, "Caught exception in list, error_code " << ex.code().value());  
    357346        if (ex.code().value() == EINVAL) 
    358 #endif 
    359347            throw CF::InvalidFileName(CF::CFEINVAL, ex.what()); 
    360348        throw CF::FileException(CF::CFNOTSET, ex.what()); 

  • ossiedev/branches/mcarrick/ossiedev/system/ossie/framework/FileSystem_impl.cpp

    r10798 r10799  
    3131#include <boost/filesystem/path.hpp> 
    3232#include <boost/filesystem/exception.hpp> 
     33#include <boost/cerrno.hpp> 
     34 
    3335#ifndef BOOST_VERSION 
    3436#include <boost/version.hpp> 
    35 #endif 
    36  
    37 #if BOOST_VERSION < 103500 
    38 #  include <boost/filesystem/cerrno.hpp> 
    39 #else 
    40 #  include <boost/cerrno.hpp> 
    4137#endif 
    4238 
    … …  
    120116        fs::copy_file(sFile, dFile); 
    121117    } catch (const fs::filesystem_error &ex) { 
    122 #if BOOST_VERSION < 103400 
    123         if (ex.error() == fs::not_found_error) 
    124 #elif BOOST_VERSION < 103500 
    125         if (ex.system_error() == ENOENT) 
    126 #else 
    127118        if (ex.code().value() == ENOENT) 
    128 #endif 
    129119            throw CF::FileException(CF::CFENOENT, ex.what()); 
    130120    } 
    … …  
    194184        DEBUG(4, FileSystem, "About to return from list."); 
    195185    } catch (const fs::filesystem_error &ex) { 
    196 #if BOOST_VERSION < 103400 
    197         DEBUG(9, FileSystem, "Caught exception in list, error_code " << ex.error()); 
    198         if (ex.error() == fs::other_error) 
    199 #elif BOOST_VERSION < 103500 
    200         DEBUG(9, FileSystem, "Caught exception in list, error_code " << ex.system_error()); 
    201         if (ex.system_error() == EINVAL) 
    202 #else 
    203186        DEBUG(9, FileSystem, "Caught exception in list, error_code " << ex.code().value()); 
    204187        if (ex.code().value() == EINVAL) 
    205 #endif 
    206188            throw CF::InvalidFileName(CF::CFEINVAL, ex.what()); 
    207189        throw CF::FileException(CF::CFNOTSET, ex.what());