From f8b78045657c692079619ad20036712c96b46972 Mon Sep 17 00:00:00 2001 From: boris Date: Mon, 25 Sep 2006 13:13:15 +0000 Subject: ChangeLogTag: Mon Sep 25 13:06:05 UTC 2006 Boris Kolpackov --- CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp | 22 ++++++++++++---------- CIAO/CCF/CCF/CIDL/SemanticAction/Composition.hpp | 7 ++++--- CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp | 4 ++-- CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp | 23 ++++++++++++----------- CIAO/CCF/CCF/IDL2/SemanticAction/Operation.hpp | 7 ++++--- CIAO/ChangeLog | 19 +++++++++++++++---- 6 files changed, 49 insertions(+), 33 deletions(-) diff --git a/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp b/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp index 02e0e55ce4f..e8eb6f99924 100644 --- a/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp +++ b/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.cpp @@ -12,16 +12,18 @@ namespace CCF { namespace SemanticAction { - namespace - { - char* labels[] = {"entity", "process", "service", "session" }; - } - - std::ostream& - operator<< (std::ostream& o, Composition::Category::Value v) - { - return o << labels[v]; - } } } } + +namespace +{ + char* labels[] = {"entity", "process", "service", "session" }; +} + +std::ostream& +operator<< (std::ostream& o, + CCF::CIDL::SemanticAction::Composition::Category::Value v) +{ + return o << labels[v]; +} diff --git a/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.hpp b/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.hpp index 802cc64ede3..71cfc22a108 100644 --- a/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.hpp +++ b/CIAO/CCF/CCF/CIDL/SemanticAction/Composition.hpp @@ -23,9 +23,6 @@ namespace CCF { entity , process, service, session }; - - friend std::ostream& - operator<< (std::ostream& o, Value v); }; virtual void @@ -38,4 +35,8 @@ namespace CCF } } +std::ostream& +operator<< (std::ostream& o, + CCF::CIDL::SemanticAction::Composition::Category::Value v); + #endif // CCF_CIDL_SEMANTIC_ACTION_COMPOSITION_HPP diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp index 0e86ad26ff3..6a680d14831 100644 --- a/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp +++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp @@ -21,9 +21,9 @@ namespace CCF void Factory:: define_fund_type (Root& root, SimpleName const& name) { - ctx_.tu ().new_edge ( + ctx_.tu ().template new_edge ( root, - ctx_.tu ().new_node ("fundamental-types", 0), name); + ctx_.tu ().template new_node ("fundamental-types", 0), name); } Factory:: diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp index 5b6190d1b4a..b75d48400a4 100644 --- a/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp +++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.cpp @@ -12,17 +12,18 @@ namespace CCF { namespace SemanticAction { - namespace - { - char* labels[] = {"in", "out", "inout"}; - } - - std::ostream& - - operator<< (std::ostream& o, Operation::Direction::Value d) - { - return o << labels[d]; - } } } } + +namespace +{ + char* labels[] = {"in", "out", "inout"}; +} + +std::ostream& +operator<< (std::ostream& o, + CCF::IDL2::SemanticAction::Operation::Direction::Value d) +{ + return o << labels[d]; +} diff --git a/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.hpp b/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.hpp index 89e83c50b9b..99131c60e15 100644 --- a/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.hpp +++ b/CIAO/CCF/CCF/IDL2/SemanticAction/Operation.hpp @@ -37,9 +37,6 @@ namespace CCF out, inout }; - - friend std::ostream& - operator<< (std::ostream& o, Value d); }; virtual void @@ -54,4 +51,8 @@ namespace CCF } } +std::ostream& +operator<< (std::ostream& o, + CCF::IDL2::SemanticAction::Operation::Direction::Value d); + #endif // CCF_IDL2_SEMANTIC_ACTION_OPERATION_HPP diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index cf13ab20d78..624bb06a809 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,8 +1,19 @@ +Mon Sep 25 13:06:05 UTC 2006 Boris Kolpackov + + * CCF/CCF/IDL2/SemanticAction/Operation.cpp: + * CCF/CCF/IDL2/SemanticAction/Operation.hpp: + * CCF/CCF/IDL2/SemanticAction/Impl/Factory.cpp: + * CCF/CCF/CIDL/SemanticAction/Composition.cpp: + * CCF/CCF/CIDL/SemanticAction/Composition.hpp: + + Move some operator<< operators to the global scope so that they + do not hide others. + Sun Sep 24 21:06:07 UTC 2006 Shanshan Jiang * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h Removed the unnecessary Repoman head file. - + Sat Sep 23 04:31:13 UTC 2006 Shanshan Jiang * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp @@ -28,7 +39,7 @@ Sat Sep 23 04:07:59 UTC 2006 Shanshan Jiang Added these files which implement the Plan_Generator project. This project is used to retrieve information from Repoman and generate/modify DeploymentPlans based on different demands. - + * DAnCE/Planner * DAnCE/Planner/Node_T.cpp * DAnCE/Planner/Node_T.h @@ -42,13 +53,13 @@ Sat Sep 23 04:07:59 UTC 2006 Shanshan Jiang * DAnCE/Planner/Planner.mpc Deleted these files. The planner project has been replaced by the more useful Plan_Generator project. - + * DAnCE/Plan_Launcher/Plan_Launcher.cpp * DAnCE/Plan_Launcher/Plan_Launcher.mpc * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h Modified these files. - + * DAnCE/Plan_Generator/PCVisitor.cpp * DAnCE/Plan_Generator/PCVisitor.h * DAnCE/Plan_Generator/PCVisitorBase.cpp -- cgit v1.2.1