summaryrefslogtreecommitdiff
path: root/cpp/demo/Manual/simple_filesystem/FilesystemI.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-02-03 10:04:58 -0330
committerDwayne Boone <dwayne@zeroc.com>2015-02-03 10:04:58 -0330
commit0c9eca09e0140dbdc6e954d8d1475cf99c52073d (patch)
tree674c29c884de6cb8a86f3ccabd2d1d69334133d4 /cpp/demo/Manual/simple_filesystem/FilesystemI.cpp
parentFixed compiler warning/error (diff)
downloadice-0c9eca09e0140dbdc6e954d8d1475cf99c52073d.tar.bz2
ice-0c9eca09e0140dbdc6e954d8d1475cf99c52073d.tar.xz
ice-0c9eca09e0140dbdc6e954d8d1475cf99c52073d.zip
ICE-5814 build linix/osx demos with high warning levels in git
Diffstat (limited to 'cpp/demo/Manual/simple_filesystem/FilesystemI.cpp')
-rw-r--r--cpp/demo/Manual/simple_filesystem/FilesystemI.cpp12
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)
{
}