diff options
| author | Bernard Normier <bernard@zeroc.com> | 2004-05-08 00:46:24 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2004-05-08 00:46:24 +0000 |
| commit | a42bdd628e9e33f5614944c18e67e2505c495232 (patch) | |
| tree | 2e95f8b08c64e31cf7c5f92b9e6a816437bac40f /cpp/src/FreezeScript/DumpDescriptors.cpp | |
| parent | fixing AMI bug with routers (diff) | |
| download | ice-a42bdd628e9e33f5614944c18e67e2505c495232.tar.bz2 ice-a42bdd628e9e33f5614944c18e67e2505c495232.tar.xz ice-a42bdd628e9e33f5614944c18e67e2505c495232.zip | |
GCC 3.4 port
Diffstat (limited to 'cpp/src/FreezeScript/DumpDescriptors.cpp')
| -rw-r--r-- | cpp/src/FreezeScript/DumpDescriptors.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/cpp/src/FreezeScript/DumpDescriptors.cpp b/cpp/src/FreezeScript/DumpDescriptors.cpp index bcc46d72f0d..97b46feb112 100644 --- a/cpp/src/FreezeScript/DumpDescriptors.cpp +++ b/cpp/src/FreezeScript/DumpDescriptors.cpp @@ -969,8 +969,9 @@ FreezeScript::ExecutableContainerDescriptor::execute(const SymbolTablePtr& sym, FreezeScript::IfDescriptor::IfDescriptor(const DescriptorPtr& parent, int line, const DataFactoryPtr& factory, const ErrorReporterPtr& errorReporter, const IceXML::Attributes& attributes) : - ExecutableContainerDescriptor(parent, line, factory, errorReporter, attributes, "if"), - Descriptor(parent, line, factory, errorReporter) + Descriptor(parent, line, factory, errorReporter), + ExecutableContainerDescriptor(parent, line, factory, errorReporter, attributes, "if") + { DescriptorErrorContext ctx(_errorReporter, "if", _line); @@ -1015,8 +1016,9 @@ FreezeScript::IterateDescriptor::IterateDescriptor(const DescriptorPtr& parent, const DataFactoryPtr& factory, const ErrorReporterPtr& errorReporter, const IceXML::Attributes& attributes) : - ExecutableContainerDescriptor(parent, line, factory, errorReporter, attributes, "iterate"), - Descriptor(parent, line, factory, errorReporter) + Descriptor(parent, line, factory, errorReporter), + ExecutableContainerDescriptor(parent, line, factory, errorReporter, attributes, "iterate") + { DescriptorErrorContext ctx(_errorReporter, "iterate", _line); @@ -1157,8 +1159,10 @@ FreezeScript::DumpDescriptor::DumpDescriptor(const DescriptorPtr& parent, int li const ErrorReporterPtr& errorReporter, const IceXML::Attributes& attributes, const Slice::UnitPtr& unit) : + Descriptor(parent, line, factory, errorReporter), ExecutableContainerDescriptor(parent, line, factory, errorReporter, attributes, "dump"), - Descriptor(parent, line, factory, errorReporter), _base(true), _contents(true) + _base(true), + _contents(true) { DescriptorErrorContext ctx(_errorReporter, "dump", _line); @@ -1238,8 +1242,9 @@ FreezeScript::RecordDescriptor::RecordDescriptor(const DescriptorPtr& parent, in const ErrorReporterPtr& errorReporter, const IceXML::Attributes& attributes, const Slice::UnitPtr& unit) : + Descriptor(parent, line, factory, errorReporter), ExecutableContainerDescriptor(parent, line, factory, errorReporter, attributes, "record"), - Descriptor(parent, line, factory, errorReporter), _unit(unit) + _unit(unit) { } @@ -1343,8 +1348,9 @@ FreezeScript::DatabaseDescriptor::DatabaseDescriptor(const DescriptorPtr& parent const ErrorReporterPtr& errorReporter, const IceXML::Attributes& attributes, const Slice::UnitPtr& unit) : + Descriptor(parent, line, factory, errorReporter), ExecutableContainerDescriptor(parent, line, factory, errorReporter, attributes, "database"), - Descriptor(parent, line, factory, errorReporter), _unit(unit) + _unit(unit) { DescriptorErrorContext ctx(_errorReporter, "database", _line); |