4 files changed, 24 insertions, 20 deletions
diff --git a/cpp/include/Ice/.gitignore b/cpp/include/Ice/.gitignore
index fd7066fcaa2..ac34a90a522 100644
--- a/cpp/include/Ice/.gitignore
+++ b/cpp/include/Ice/.gitignore
@@ -2,42 +2,42 @@
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 BuiltinSequences.h
-CommunicatorF.h
 Communicator.h
-ConnectionF.h
+CommunicatorF.h
 Connection.h
+ConnectionF.h
 Current.h
 Endpoint.h
 EndpointF.h
 EndpointTypes.h
 FacetMap.h
 Identity.h
-ImplicitContextF.h
 ImplicitContext.h
+ImplicitContextF.h
+Instrumentation.h
+InstrumentationF.h
 LocalException.h
-LocatorF.h
 Locator.h
-LoggerF.h
+LocatorF.h
 Logger.h
+LoggerF.h
 Metrics.h
-ObjectAdapterF.h
 ObjectAdapter.h
-ObjectFactoryF.h
+ObjectAdapterF.h
 ObjectFactory.h
-Instrumentation.h
-InstrumentationF.h
-PluginF.h
+ObjectFactoryF.h
 Plugin.h
-ProcessF.h
+PluginF.h
 Process.h
-PropertiesF.h
-PropertiesAdmin.h
+ProcessF.h
 Properties.h
+PropertiesAdmin.h
+PropertiesF.h
 RemoteLogger.h
-RouterF.h
 Router.h
-ServantLocatorF.h
+RouterF.h
 ServantLocator.h
+ServantLocatorF.h
 SliceChecksumDict.h
 ValueFactoryF.h
 ValueFactory.h
diff --git a/cpp/include/IceGrid/.gitignore b/cpp/include/IceGrid/.gitignore
index 195635b503d..9d13a816fbf 100644
--- a/cpp/include/IceGrid/.gitignore
+++ b/cpp/include/IceGrid/.gitignore
@@ -2,14 +2,13 @@
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 Admin.h
-Discovery.h
+Descriptor.h
 Exception.h
 FileParser.h
 Locator.h
+Observer.h
+PluginFacade.h
 Query.h
 Registry.h
 Session.h
-Observer.h
-Descriptor.h
 UserAccountMapper.h
-PluginFacade.h
diff --git a/cpp/include/IceSSL/.gitignore b/cpp/include/IceSSL/.gitignore
index f53e54c68e3..8ff8c54a7de 100644
--- a/cpp/include/IceSSL/.gitignore
+++ b/cpp/include/IceSSL/.gitignore
@@ -1,5 +1,5 @@
 // Generated by makegitignore.py
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
-EndpointInfo.h
 ConnectionInfo.h
+EndpointInfo.h
diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h
index 3b148f5dce4..7d5c478834d 100644
--- a/cpp/include/IceUtil/FileUtil.h
+++ b/cpp/include/IceUtil/FileUtil.h
@@ -40,6 +40,11 @@ ICE_UTIL_API bool fileExists(const std::string&);
 //
 ICE_UTIL_API bool directoryExists(const std::string&);
 
+//
+// Determine if a directory exists and is empty.
+//
+ICE_UTIL_API bool isEmptyDirectory(const std::string&);
+
 #ifdef _WIN32
 
 #if defined(__MINGW32__)