summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2009-04-05 09:41:55 +1000
committerMichi Henning <michi@zeroc.com>2009-04-05 09:41:55 +1000
commit12d664c993e0abe5d9c7bdf9a1cab0138964233d (patch)
tree7b71e488cc5e0f3f40cc7f262b58d624587ee573 /cpp
parentBug 3939 - Can't compile Ice for Java on OS X (diff)
downloadice-12d664c993e0abe5d9c7bdf9a1cab0138964233d.tar.bz2
ice-12d664c993e0abe5d9c7bdf9a1cab0138964233d.tar.xz
ice-12d664c993e0abe5d9c7bdf9a1cab0138964233d.zip
Bug 3948 - Bad link with slice2html
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/slice2html/Gen.cpp30
-rw-r--r--cpp/src/slice2html/Gen.h2
2 files changed, 16 insertions, 16 deletions
diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
index 4680c57a2ae..de131945303 100644
--- a/cpp/src/slice2html/Gen.cpp
+++ b/cpp/src/slice2html/Gen.cpp
@@ -562,7 +562,7 @@ Slice::GeneratorBase::printMetaData(const ContainedPtr& p)
}
void
-Slice::GeneratorBase::printSummary(const ContainedPtr& p, const ContainerPtr& module, bool deprecated)
+Slice::GeneratorBase::printSummary(const ContainedPtr& p, const ContainerPtr& module, bool deprecated, bool forIndex)
{
ContainerPtr container = ContainerPtr::dynamicCast(p);
if(!container)
@@ -575,7 +575,7 @@ Slice::GeneratorBase::printSummary(const ContainedPtr& p, const ContainerPtr& mo
container = module;
}
- string summary = getComment(p, container, true, module);
+ string summary = getComment(p, container, true, forIndex);
_out << nl << summary;
if(deprecated)
@@ -2042,7 +2042,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2071,7 +2071,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2092,7 +2092,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2115,7 +2115,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2138,7 +2138,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2161,7 +2161,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2184,7 +2184,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2207,7 +2207,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2230,7 +2230,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2427,7 +2427,7 @@ Slice::ExceptionGenerator::generate(const ExceptionPtr& e)
end();
start("dd");
string metadata;
- printSummary(*q, e, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, e, (*q)->findMetaData("deprecate", metadata), false);
end();
}
end();
@@ -2557,7 +2557,7 @@ Slice::ClassGenerator::generate(const ClassDefPtr& c)
end();
start("dd");
string metadata;
- printSummary(*q, c, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, c, (*q)->findMetaData("deprecate", metadata), false);
end();
}
end();
@@ -2578,7 +2578,7 @@ Slice::ClassGenerator::generate(const ClassDefPtr& c)
end();
start("dd");
string metadata;
- printSummary(*q, c, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, c, (*q)->findMetaData("deprecate", metadata), false);
end();
}
end();
@@ -2739,7 +2739,7 @@ Slice::StructGenerator::generate(const StructPtr& s)
end();
start("dd");
string metadata;
- printSummary(*q, s, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, s, (*q)->findMetaData("deprecate", metadata), false);
end();
}
end();
diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h
index 776035b96bf..cacdd581a4b 100644
--- a/cpp/src/slice2html/Gen.h
+++ b/cpp/src/slice2html/Gen.h
@@ -52,7 +52,7 @@ protected:
void printComment(const ContainedPtr&, const ContainerPtr&, const ::std::string&, bool = false);
void printMetaData(const ContainedPtr&);
- void printSummary(const ContainedPtr&, const ContainerPtr&, bool);
+ void printSummary(const ContainedPtr&, const ContainerPtr&, bool, bool);
void printHeaderFooter(const ContainedPtr&);
void printSearch();