4 files changed, 18 insertions, 10 deletions
diff --git a/cpp/demo/Manual/simple_filesystem/Client.cpp b/cpp/demo/Manual/simple_filesystem/Client.cpp
index 2452da99f63..1a225684df3 100644
--- a/cpp/demo/Manual/simple_filesystem/Client.cpp
+++ b/cpp/demo/Manual/simple_filesystem/Client.cpp
@@ -28,12 +28,12 @@ listRecursive(const DirectoryPrx& dir, int depth = 0)
 
     for(NodeSeq::const_iterator i = contents.begin(); i != contents.end(); ++i)
     {
-        DirectoryPrx dir = DirectoryPrx::checkedCast(*i);
+        DirectoryPrx d = DirectoryPrx::checkedCast(*i);
         FilePrx file = FilePrx::uncheckedCast(*i);
-        cout << indent << (*i)->name() << (dir ? " (directory):" : " (file):") << endl;
-        if(dir)
+        cout << indent << (*i)->name() << (d ? " (directory):" : " (file):") << endl;
+        if(d)
         {
-            listRecursive(dir, depth);
+            listRecursive(d, depth);
         }
         else
         {
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)
 {
 }
 
diff --git a/cpp/demo/Manual/simple_filesystem/Makefile b/cpp/demo/Manual/simple_filesystem/Makefile
index 9b04bf928a8..d1a41aa9833 100644
--- a/cpp/demo/Manual/simple_filesystem/Makefile
+++ b/cpp/demo/Manual/simple_filesystem/Makefile
@@ -9,6 +9,10 @@
 
 top_srcdir	= ../../..
 
+ifeq ($(shell test -f $(top_srcdir)/../.gitignore && echo 0),0)
+MAXWARN         = yes
+endif
+
 CLIENT		= client
 SERVER		= server
 
diff --git a/cpp/demo/Manual/simple_filesystem/Makefile.mak b/cpp/demo/Manual/simple_filesystem/Makefile.mak
index 1d71f99c229..d28815d2064 100644
--- a/cpp/demo/Manual/simple_filesystem/Makefile.mak
+++ b/cpp/demo/Manual/simple_filesystem/Makefile.mak
@@ -9,6 +9,10 @@
 
 top_srcdir	= ..\..\..
 
+!if exist ($(top_srcdir)\..\.gitignore)
+MAXWARN         = yes
+!endif
+
 CLIENT		= client.exe
 SERVER		= server.exe