From 63c497458764267f31d2737a2d300155126cde6a Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 28 Nov 2019 13:49:20 +0100 Subject: [PATCH] vfs server: fix File_system namespace warnings --- repos/os/src/server/vfs/main.cc | 2 +- repos/os/src/server/vfs/node.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repos/os/src/server/vfs/main.cc b/repos/os/src/server/vfs/main.cc index 6764b5a73..520bd1b2c 100644 --- a/repos/os/src/server/vfs/main.cc +++ b/repos/os/src/server/vfs/main.cc @@ -232,7 +232,7 @@ class Vfs_server::Session_component : private Session_resources, } }); } - catch (File_system::Invalid_handle) { + catch (::File_system::Invalid_handle) { consume_and_ack_invalid_packet(); } if (!progress_in_iteration) diff --git a/repos/os/src/server/vfs/node.h b/repos/os/src/server/vfs/node.h index 80d3e1598..5585f1dab 100644 --- a/repos/os/src/server/vfs/node.h +++ b/repos/os/src/server/vfs/node.h @@ -443,7 +443,7 @@ class Vfs_server::Io_node : public Vfs_server::Node, void _execute_write_timestamp() { try { - _packet.with_timestamp([&] (File_system::Timestamp const time) { + _packet.with_timestamp([&] (::File_system::Timestamp const time) { Vfs::Timestamp ts { .value = time.value }; _handle.fs().update_modification_timestamp(&_handle, ts); }); @@ -868,7 +868,7 @@ struct Vfs_server::Directory : Io_node Session_writeable const _writeable; typedef Directory_service::Dirent Vfs_dirent; - typedef File_system::Directory_entry Fs_dirent; + typedef ::File_system::Directory_entry Fs_dirent; bool _position_and_length_aligned_with_dirent_size() {