Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix

include/fc/filesystem.hpp

@@ -85,6 +85,24 @@ namespace fc {
     #endif
   };
 
+  namespace detail
+  {
+    class path_wrapper
+    {
+    public:
+      path_wrapper(path p) :
+        _path(p)
+      {
+      }
+      const path* operator->() const
+      {
+        return &_path;
+      }
+    private:
+      path _path;
+    };
+  }
+
   class directory_iterator {
     public:
       directory_iterator( const fc::path& p );
@@ -92,6 +110,7 @@ namespace fc {
       ~directory_iterator();
 
       fc::path            operator*()const;
+      detail::path_wrapper operator->() const;
       directory_iterator& operator++(int);
       directory_iterator& operator++();
 

src/filesystem.cpp

@@ -158,6 +158,7 @@ namespace fc {
       directory_iterator::~directory_iterator(){}
 
       fc::path            directory_iterator::operator*()const { return boost::filesystem::path(*(*_p)); }
+      detail::path_wrapper directory_iterator::operator->() const { return detail::path_wrapper(boost::filesystem::path(*(*_p))); }
       directory_iterator& directory_iterator::operator++(int)  { (*_p)++; return *this; }
       directory_iterator& directory_iterator::operator++()     { (*_p)++; return *this; }
 

src/network/ntp.cpp

@@ -74,7 +74,10 @@ namespace fc
               {
                  fc::ip::endpoint from;
                  std::array<uint64_t, 1024> recv_buf;
-                 _sock.receive_from( (char*)recv_buf.data(), recv_buf.size(), from );
+                 try
+                 {
+                   _sock.receive_from( (char*)recv_buf.data(), recv_buf.size(), from );
+                 } FC_RETHROW_EXCEPTIONS(error, "Error reading from NTP socket");
 
                  uint64_t receive_timestamp_net_order = recv_buf[4];
                  uint64_t receive_timestamp_host = bswap_64(receive_timestamp_net_order);
@@ -120,7 +123,7 @@ namespace fc
     } 
     catch ( const fc::exception& )
     {
-       // we exepect canceled exceptions, but cannot throw
+       // we expect canceled exceptions, but cannot throw
        // from destructor
     }
   }