diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-02-09 19:10:58 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-02-09 19:10:58 +0000 |
| commit | e308ea7f77f93404fc7bc83d6158b5ea8832e4f4 (patch) | |
| tree | 7df9236249cc5a8577dd09dda522822f5842c924 /cpp | |
| parent | Modified "cpp:include" format slightly (diff) | |
| download | ice-e308ea7f77f93404fc7bc83d6158b5ea8832e4f4.tar.bz2 ice-e308ea7f77f93404fc7bc83d6158b5ea8832e4f4.tar.xz ice-e308ea7f77f93404fc7bc83d6158b5ea8832e4f4.zip | |
cked out previous change
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/slice2cppe/Gen.cpp | 6 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/Test.ice | 2 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/TestAMD.ice | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 474bac86952..94c99dc646c 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -391,14 +391,14 @@ Slice::Gen::GlobalIncludeVisitor::visitModuleStart(const ModulePtr& p) assert(dc); StringList globalMetaData = dc->getMetaData(); - static const string includePrefix = "cpp:include "; + static const string includePrefix = "cpp:include:"; for(StringList::const_iterator q = globalMetaData.begin(); q != globalMetaData.end(); ++q) { string s = *q; if(s.find(includePrefix) == 0) { - H << nl << "#" << s.substr(strlen("cpp:")); + H << nl << "#include <" << s.substr(includePrefix.size()) << ">"; } } _finished = true; @@ -4736,7 +4736,7 @@ Slice::Gen::MetaDataVisitor::visitModuleStart(const ModulePtr& p) if(s.find(prefix) == 0) { string ss = s.substr(prefix.size()); - if(ss.find("include ") == 0) + if(ss.find("include:") == 0) { continue; } diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp index 374579d66b0..c471741344f 100644 --- a/cpp/src/slice2cppe/Gen.cpp +++ b/cpp/src/slice2cppe/Gen.cpp @@ -353,14 +353,14 @@ Slice::Gen::GlobalIncludeVisitor::visitModuleStart(const ModulePtr& p) assert(dc); StringList globalMetaData = dc->getMetaData(); - static const string includePrefix = "cpp:include "; + static const string includePrefix = "cpp:include:"; for(StringList::const_iterator q = globalMetaData.begin(); q != globalMetaData.end(); ++q) { string s = *q; if(s.find(includePrefix) == 0) { - H << nl << "#" << s.substr(strlen("cpp:")); + H << nl << "#include <" << s.substr(includePrefix.size()) << ">"; } } _finished = true; @@ -3014,7 +3014,7 @@ Slice::Gen::MetaDataVisitor::visitModuleStart(const ModulePtr& p) if(s.find(prefix) == 0) { string ss = s.substr(prefix.size()); - if(ss.find("include ") == 0) + if(ss.find("include:") == 0) { continue; } diff --git a/cpp/test/Ice/custom/Test.ice b/cpp/test/Ice/custom/Test.ice index 8d03796c1ce..3d750d5155f 100644 --- a/cpp/test/Ice/custom/Test.ice +++ b/cpp/test/Ice/custom/Test.ice @@ -10,7 +10,7 @@ #ifndef TEST_ICE #define TEST_ICE -[["cpp:include <deque>", "cpp:include <list>", "cpp:include \"MyByteSeq.h\""]] +[["cpp:include:deque", "cpp:include:list", "cpp:include:MyByteSeq.h"]] module Test { diff --git a/cpp/test/Ice/custom/TestAMD.ice b/cpp/test/Ice/custom/TestAMD.ice index b281e085455..3a7727ce0b1 100644 --- a/cpp/test/Ice/custom/TestAMD.ice +++ b/cpp/test/Ice/custom/TestAMD.ice @@ -10,7 +10,7 @@ #ifndef TEST_ICE #define TEST_ICE -[["cpp:include <deque>", "cpp:include <list>", "cpp:include \"MyByteSeq.h\""]] +[["cpp:include:deque", "cpp:include:list", "cpp:include:MyByteSeq.h"]] module Test { |