diff options
Diffstat (limited to 'cpp/demo/Manual/simple_filesystem/FilesystemI.cpp')
| -rw-r--r-- | cpp/demo/Manual/simple_filesystem/FilesystemI.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/demo/Manual/simple_filesystem/FilesystemI.cpp b/cpp/demo/Manual/simple_filesystem/FilesystemI.cpp index 13aa70d2a8d..b4b8a461cad 100644 --- a/cpp/demo/Manual/simple_filesystem/FilesystemI.cpp +++ b/cpp/demo/Manual/simple_filesystem/FilesystemI.cpp @@ -22,8 +22,8 @@ Filesystem::NodeI::name(const Ice::Current&) // NodeI constructor -Filesystem::NodeI::NodeI(const Ice::CommunicatorPtr&, const string& name, const DirectoryIPtr& parent) : - _name(name), _parent(parent) +Filesystem::NodeI::NodeI(const Ice::CommunicatorPtr&, const string& nm, const DirectoryIPtr& parent) : + _name(nm), _parent(parent) { // Create an identity. The root directory has the fixed identity "RootDir" if(parent) @@ -66,8 +66,8 @@ Filesystem::FileI::write(const Filesystem::Lines& text, const Ice::Current&) // FileI constructor -Filesystem::FileI::FileI(const Ice::CommunicatorPtr& communicator, const string& name, const DirectoryIPtr& parent) : - NodeI(communicator, name, parent) +Filesystem::FileI::FileI(const Ice::CommunicatorPtr& communicator, const string& nm, const DirectoryIPtr& parent) : + NodeI(communicator, nm, parent) { } @@ -81,9 +81,9 @@ Filesystem::DirectoryI::list(const Ice::Current&) // DirectoryI constructor -Filesystem::DirectoryI::DirectoryI(const Ice::CommunicatorPtr& communicator, const string& name, +Filesystem::DirectoryI::DirectoryI(const Ice::CommunicatorPtr& communicator, const string& nm, const DirectoryIPtr& parent) : - NodeI(communicator, name, parent) + NodeI(communicator, nm, parent) { } |