Changeset 9980 for ossiedev/trunk/system/ossie/framework/FileSystem_impl.cpp

Timestamp:

04/06/10 01:23:22 (3 years ago)

Author:

shereef

Message:

fixes for boost <= v1.35, >= v1.37 ... i hope

Files:

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

ossiedev/trunk/system/ossie/framework/FileSystem_impl.cpp

@@ -35 +35 @@
 #endif
 
-#if BOOST_VERSION < 103499
+#if BOOST_VERSION < 103500
 #  include <boost/filesystem/cerrno.hpp>
-#elif BOOST_VERSION < 103799
-#  include <boost/cerrno.hpp>
 #else
-#  warning "unknown boost version"
 #  include <boost/cerrno.hpp>
 #endif
@@ -120 +117 @@
 
         fs::copy_file(sFile, dFile);
-#if BOOST_VERSION < 103499
     } 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());
-#elif BOOST_VERSION < 103799
-    } catch (const boost::system::system_error &ex ) {
-        if (ex.code().value() == ENOENT)
-            throw CF::FileException(CF::CFENOENT, ex.what());
-#else
-    } catch (const boost::system::system_error &ex ) {
-        throw CF::FileException(CF::CFENOENT, ex.what());
-#endif
     }
 }
@@ -197 +191 @@
         }
         DEBUG(4, FileSystem, "About to return from list.");
-#if BOOST_VERSION < 103499
     } 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)
-            throw CF::InvalidFileName(CF::CFEINVAL, ex.what());
-#elif BOOST_VERSION < 103799
-    } catch (const boost::system::system_error &ex) {
+#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());
-#else
-    } catch (const boost::system::system_error &ex) {
         throw CF::FileException(CF::CFNOTSET, ex.what());
-#endif
     }
     DEBUG(4, FileSystem, "Leaving recursiveList")