Changeset 10799 for ossiedev/branches/mcarrick/ossiedev/system/ossie/framework/FileSystem_impl.cpp

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

Files:

• ossiedev/branches/mcarrick/ossiedev/system/ossie/framework/FileSystem_impl.cpp (modified) (3 diffs)

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

@@ -31 +31 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/exception.hpp>
+#include <boost/cerrno.hpp>
+
 #ifndef BOOST_VERSION
 #include <boost/version.hpp>
-#endif
-
-#if BOOST_VERSION < 103500
-#  include <boost/filesystem/cerrno.hpp>
-#else
-#  include <boost/cerrno.hpp>
 #endif
 
@@ -120 +116 @@
         fs::copy_file(sFile, dFile);
     } catch (const fs::filesystem_error &ex) {
-#if BOOST_VERSION < 103400
-        if (ex.error() == fs::not_found_error)
-#elif BOOST_VERSION < 103500
-        if (ex.system_error() == ENOENT)
-#else
         if (ex.code().value() == ENOENT)
-#endif
             throw CF::FileException(CF::CFENOENT, ex.what());
     }
@@ -194 +184 @@
         DEBUG(4, FileSystem, "About to return from list.");
     } catch (const fs::filesystem_error &ex) {
-#if BOOST_VERSION < 103400
-        DEBUG(9, FileSystem, "Caught exception in list, error_code " << ex.error());
-        if (ex.error() == fs::other_error)
-#elif BOOST_VERSION < 103500
-        DEBUG(9, FileSystem, "Caught exception in list, error_code " << ex.system_error());
-        if (ex.system_error() == EINVAL)
-#else
         DEBUG(9, FileSystem, "Caught exception in list, error_code " << ex.code().value());
         if (ex.code().value() == EINVAL)
-#endif
             throw CF::InvalidFileName(CF::CFEINVAL, ex.what());
         throw CF::FileException(CF::CFNOTSET, ex.what());