diff options
| -rw-r--r-- | cpp/slice/IceGrid/Descriptor.ice | 1 | ||||
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.h | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Internal.ice | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/cpp/slice/IceGrid/Descriptor.ice b/cpp/slice/IceGrid/Descriptor.ice index 2fa235fb1bc..cd67dbdedd2 100644 --- a/cpp/slice/IceGrid/Descriptor.ice +++ b/cpp/slice/IceGrid/Descriptor.ice @@ -200,6 +200,7 @@ struct DistributionDescriptor /** The source directories. */ Ice::StringSeq directories; }; +dictionary<string, DistributionDescriptor> DistributionDescriptorDict; /** * diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h index 44526fa9f90..1cd19533590 100644 --- a/cpp/src/IceGrid/DescriptorHelper.h +++ b/cpp/src/IceGrid/DescriptorHelper.h @@ -11,8 +11,8 @@ #define ICE_GRID_DESCRIPTOR_HELPER_H #include <IceUtil/OutputUtil.h> -#include <IceGrid/Internal.h> #include <IceXML/Parser.h> +#include <IceGrid/Admin.h> namespace IceGrid { diff --git a/cpp/src/IceGrid/Internal.ice b/cpp/src/IceGrid/Internal.ice index c8fd4ace16f..7557a344c3a 100644 --- a/cpp/src/IceGrid/Internal.ice +++ b/cpp/src/IceGrid/Internal.ice @@ -209,8 +209,6 @@ interface Server ["ami"] void setProcess(Ice::Process* proc); }; -dictionary<string, DistributionDescriptor> DistributionDescriptorDict; - interface Node { /** |