diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-04-13 12:32:44 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-04-13 12:32:44 -0700 |
| commit | e0381d075f800ca89085d3ead77569c7b7d42b22 (patch) | |
| tree | 974de2bc93d5862a3288f37018fb41d0d6a622a4 /cpp/src | |
| parent | Preprocessor fix (diff) | |
| download | ice-e0381d075f800ca89085d3ead77569c7b7d42b22.tar.bz2 ice-e0381d075f800ca89085d3ead77569c7b7d42b22.tar.xz ice-e0381d075f800ca89085d3ead77569c7b7d42b22.zip | |
slice2confluence fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/slice2confluence/ConfluenceOutput.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Gen.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Main.cpp | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp index 6105f1357e4..b464f8a9fcd 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.cpp +++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp @@ -805,7 +805,7 @@ Confluence::ConfluenceOutput::getMarkerLimits(const string& str) } else { - consoleErr << "getEscaperLimits FOUND START OF ESCAPE MARKER WITH NO MATCHING END IN STRING:" + consoleErr << "getMarkerLimits FOUND START OF ESCAPE MARKER WITH NO MATCHING END IN STRING:" << endl << str.substr(start) << endl; break; } diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp index 5610fd65c61..064236b0c61 100644 --- a/cpp/src/slice2confluence/Gen.cpp +++ b/cpp/src/slice2confluence/Gen.cpp @@ -1017,7 +1017,8 @@ Slice::GeneratorBase::toString(const SyntaxTreeBasePtr& p, const ContainerPtr& c "string", "Object", "Object*", - "LocalObject" + "LocalObject", + "Value" }; BuiltinPtr builtin = BuiltinPtr::dynamicCast(p); @@ -1234,7 +1235,6 @@ Slice::GeneratorBase::getComment(const ContainedPtr& contained, const ContainerP static const string atLink = "{@link"; string::size_type pos = s.find(atLink, i); - comment += Confluence::ConfluenceOutput::TEMP_ESCAPER_START; if(pos != i) { comment += '{'; @@ -1248,6 +1248,7 @@ Slice::GeneratorBase::getComment(const ContainedPtr& contained, const ContainerP } string literal = s.substr(pos + atLink.size(), endpos - pos - atLink.size()); size_t sz = 0; + comment += Confluence::ConfluenceOutput::TEMP_ESCAPER_START; comment += toString(toSliceID(literal, contained->file()), container, false, forIndex, summary ? &sz : 0); comment += Confluence::ConfluenceOutput::TEMP_ESCAPER_END; summarySize += sz; diff --git a/cpp/src/slice2confluence/Main.cpp b/cpp/src/slice2confluence/Main.cpp index 06736afe16f..32c68dbe877 100644 --- a/cpp/src/slice2confluence/Main.cpp +++ b/cpp/src/slice2confluence/Main.cpp @@ -273,7 +273,7 @@ compile(const vector<string>& argv) for(vector<string>::size_type idx = 0; idx < args.size(); ++idx) { PreprocessorPtr icecpp = Preprocessor::create(argv[0], args[idx], cppArgs); - FILE* cppHandle = icecpp->preprocess(true); + FILE* cppHandle = icecpp->preprocess(true, "-D__SLICE2CONFLUENCE__"); if(cppHandle == 0) { |