Simplified creation of Admin facets in IceBox; simplified test for Admin enabled (Ice.Admin.Enabled if defined, otherwise check Ice.Admin.Endpoints and no other property)

1 files changed, 7 insertions, 13 deletions

diff --git a/cpp/src/Ice/LoggerAdminI.h b/cpp/src/Ice/LoggerAdminI.h
index 57991888f18..380c6ad5f5a 100644
--- a/cpp/src/Ice/LoggerAdminI.h
+++ b/cpp/src/Ice/LoggerAdminI.h
@@ -15,37 +15,31 @@
 #include <Ice/PropertiesF.h>
 #include <Ice/CommunicatorF.h>
 
-namespace Ice
+namespace IceInternal
 {
 
 //
 // A logger that works in tandem with a "Logger" admin facet.
 //
-class ICE_API LoggerAdminLogger : public Ice::Logger
+class LoggerAdminLogger : public Ice::Logger
 {
 public:
 
     //
     // Return the associated Admin facet
     //
-    virtual ObjectPtr getFacet() const = 0;
+    virtual Ice::ObjectPtr getFacet() const = 0;
 
     //
     // Destroy this logger, in particular join any thread
     // that this logger may have started
     //
-    virtual void destroy() = 0;
-    
+    virtual void destroy() = 0; 
 };
-typedef IceInternal::Handle<LoggerAdminLogger> LoggerAdminLoggerPtr;
-
-}
-
-namespace IceInternal
-{
+typedef Handle<LoggerAdminLogger> LoggerAdminLoggerPtr;
 
-Ice::LoggerAdminLoggerPtr 
-createLoggerAdminLogger(const std::string&, const Ice::PropertiesPtr&, const Ice::LoggerPtr&);
+LoggerAdminLoggerPtr 
+createLoggerAdminLogger(const Ice::PropertiesPtr&, const Ice::LoggerPtr&);
 
 }