diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Trader')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Interpreter.h | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Makefile.am | 57 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader.h | 20 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h | 10 |
13 files changed, 105 insertions, 49 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index b3e7e3ec208..0a5d53706ef 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -19,8 +19,8 @@ #include "Constraint_Visitors.h" #include "Interpreter.h" -#include "orbsvcs/CosTradingS.h" -#include "orbsvcs/CosTradingReposS.h" +#include "orbsvcs/orbsvcs/CosTradingS.h" +#include "orbsvcs/orbsvcs/CosTradingReposS.h" class TAO_Constraint_Evaluator; class TAO_Constraint_Validator; @@ -41,7 +41,7 @@ class TAO_Constraint_Validator; * EvaluationVisitor, which will evaluate the tree and decide * whether the offer meets the constraints. */ -class TAO_Trading_Serv_Export TAO_Constraint_Interpreter : public TAO_Interpreter +class TAO_Trading_Export TAO_Constraint_Interpreter : public TAO_Interpreter { public: // = Initialization and termination methods. @@ -88,7 +88,7 @@ public: * the offers, it will extract the offers in order using the * remove_offer method. */ -class TAO_Trading_Serv_Export TAO_Preference_Interpreter : public TAO_Interpreter +class TAO_Trading_Export TAO_Preference_Interpreter : public TAO_Interpreter { public: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h index dbc51ad0294..02fbfcb48c2 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h @@ -19,7 +19,7 @@ #include "tao/Basic_Types.h" -#include "orbsvcs/Trader/trading_serv_export.h" +#include "orbsvcs/orbsvcs/Trader/trading_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -54,7 +54,7 @@ namespace CORBA * subclass dispatches the method on an TAO_Constraint_Visitor * correlating to its type. */ -class TAO_Trading_Serv_Export TAO_Constraint +class TAO_Trading_Export TAO_Constraint { public: @@ -76,7 +76,7 @@ public: * * @brief A node that represents an operation with no operands. */ -class TAO_Trading_Serv_Export TAO_Noop_Constraint : public TAO_Constraint +class TAO_Trading_Export TAO_Noop_Constraint : public TAO_Constraint { public: @@ -99,7 +99,7 @@ private: * @brief TAO_Binary_Constraint represents an operation with left * and right operands. */ -class TAO_Trading_Serv_Export TAO_Binary_Constraint : public TAO_Constraint +class TAO_Trading_Export TAO_Binary_Constraint : public TAO_Constraint { public: @@ -158,7 +158,7 @@ private: * @brief TAO_Unary_Constraint represents an operation with only * one operand. */ -class TAO_Trading_Serv_Export TAO_Unary_Constraint : public TAO_Constraint +class TAO_Trading_Export TAO_Unary_Constraint : public TAO_Constraint { public: @@ -192,7 +192,7 @@ private: * @brief TAO_Property_Constraint represents a property whose * value is determined by the offer being evaluated. */ -class TAO_Trading_Serv_Export TAO_Property_Constraint : public TAO_Constraint +class TAO_Trading_Export TAO_Property_Constraint : public TAO_Constraint { public: @@ -223,7 +223,7 @@ private: * @brief TAO_Literal_Constraint represents a literal occuring in * the constraint expression tree. */ -class TAO_Trading_Serv_Export TAO_Literal_Constraint : public TAO_Constraint +class TAO_Trading_Export TAO_Literal_Constraint : public TAO_Constraint { public: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h index fd204d64153..0484d4330b5 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h @@ -15,8 +15,8 @@ #define TAO_CONSTRAINT_VISITOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Interpreter_Utils.h" -#include "orbsvcs/Trader/trading_serv_export.h" +#include "orbsvcs/orbsvcs/Trader/Interpreter_Utils.h" +#include "orbsvcs/orbsvcs/Trader/trading_export.h" #include "ace/Containers.h" class TAO_DynSequence_i; @@ -45,7 +45,7 @@ class TAO_Noop_Constraint; * method to deal with each possible type of node in an * expression tree; one for each operator in the grammar. */ -class TAO_Trading_Serv_Export TAO_Constraint_Visitor +class TAO_Trading_Export TAO_Constraint_Visitor { public: @@ -85,7 +85,7 @@ public: virtual int visit_property (TAO_Property_Constraint* literal) = 0; }; -#include "orbsvcs/Trader/Constraint_Nodes.h" +#include "orbsvcs/orbsvcs/Trader/Constraint_Nodes.h" /** * @class TAO_Constraint_Validator @@ -107,7 +107,7 @@ public: * at which point we can back out of the traversal and indicate * failure. */ -class TAO_Trading_Serv_Export TAO_Constraint_Validator : public TAO_Constraint_Visitor +class TAO_Trading_Export TAO_Constraint_Validator : public TAO_Constraint_Visitor { public: /// Constructor. @@ -217,7 +217,7 @@ private: * evaluation time errors are a divide by a property whose value * is zero and undefined properties. */ -class TAO_Trading_Serv_Export TAO_Constraint_Evaluator : public TAO_Constraint_Visitor +class TAO_Trading_Export TAO_Constraint_Evaluator : public TAO_Constraint_Visitor { public: @@ -306,7 +306,7 @@ public: private: - class TAO_Trading_Serv_Export Operand_Queue : + class TAO_Trading_Export Operand_Queue : public ACE_Unbounded_Queue <TAO_Literal_Constraint> // = TITLE // A queue adapter with methods to setting and getting operands diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h index 4575bc96e89..b667227be47 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h @@ -17,7 +17,7 @@ #include "Constraint_Nodes.h" #include "Constraint_Visitors.h" -#include "orbsvcs/Trader/trading_serv_export.h" +#include "orbsvcs/orbsvcs/Trader/trading_export.h" class TAO_Constraint_Evaluator; class TAO_Constraint_Validator; @@ -29,7 +29,7 @@ class TAO_Constraint_Validator; * build tree method invokes the yacc parser to parse a constraint * or preference string. */ -class TAO_Trading_Serv_Export TAO_Interpreter +class TAO_Trading_Export TAO_Interpreter { protected: // = Initialization and termination methods. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h index fccf6b4491b..7a8f4dcefc6 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h @@ -20,13 +20,12 @@ #include "tao/Typecode.h" #include "tao/CORBA_String.h" -#include "tao/SystemException.h" -#include "orbsvcs/Trader/trading_serv_export.h" +#include "orbsvcs/orbsvcs/Trader/trading_export.h" // = Classes to deal with the ACE_Hash_Map_Manager. -class TAO_Trading_Serv_Export TAO_String_Hash_Key : public CORBA::String_var +class TAO_Trading_Export TAO_String_Hash_Key : public CORBA::String_var { // = TITLE // Key for the Hash Table. The EXT_ID of the diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp index f621f592ea9..d907b2c4850 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp @@ -3,8 +3,8 @@ #ifndef TAO_INTERPRETER_UTILS_CPP #define TAO_INTERPRETER_UTILS_CPP -#include "orbsvcs/Trader/Interpreter_Utils_T.h" -#include "orbsvcs/Trader/Constraint_Visitors.h" +#include "orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h" +#include "orbsvcs/orbsvcs/Trader/Constraint_Visitors.h" #include "tao/DynamicAny/DynSequence_i.h" template <class OPERAND_TYPE> CORBA::Boolean diff --git a/TAO/orbsvcs/orbsvcs/Trader/Makefile.am b/TAO/orbsvcs/orbsvcs/Trader/Makefile.am new file mode 100644 index 00000000000..486744579d7 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Trader/Makefile.am @@ -0,0 +1,57 @@ +##--------------------------------------------------------------------------- +## $Id$ +## +## Makefile for TAO's Trading Service library +## +##--------------------------------------------------------------------------- + +## +## Process this file with automake to create Makefile.in +## + +## The number in AUTOMAKE_OPTIONS is the minimum required version automake +## needed to process this file. +AUTOMAKE_OPTIONS = 1.4 + +INCLUDES = -I$(top_builddir) -I$(top_srcdir) + +lib_LTLIBRARIES = libTAO_Trader.la + +libTAO_Trader_la_LDADD = \ + $(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la + +libTAO_Trader_la_SOURCES = \ + Constraint_Interpreter.cpp \ + Constraint_Nodes.cpp \ + Constraint_Visitors.cpp \ + Constraint_l.cpp \ + Constraint_y.cpp \ + Offer_Database.cpp \ + Offer_Iterators.cpp \ + Offer_Iterators_T.cpp \ + Service_Type_Repository.cpp \ + Trader.cpp \ + Trader_Interfaces.cpp \ + Trader_T.cpp \ + Trader_Utils.cpp + +noinst_HEADERS = \ + Constraint_Interpreter.h \ + Constraint_Nodes.h \ + Constraint_Tokens.h \ + Constraint_Visitors.h \ + Offer_Database.h \ + Offer_Iterators.h \ + Offer_Iterators_T.h \ + Service_Type_Repository.h \ + Trader.h \ + Trader_Interfaces.h \ + Trader_T.h \ + Trader_Utils.h + +## Clean up some additional files/directories possibly created during +## the configure script tests. +clean-local: + -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core + -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations + diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index b65b50bb49b..88a868e027d 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -26,7 +26,7 @@ * @brief This class implements CosTradingRepos::ServiceTypeRepository * IDL interface. */ -class TAO_Trading_Serv_Export TAO_Service_Type_Repository : public POA_CosTradingRepos::ServiceTypeRepository +class TAO_Trading_Export TAO_Service_Type_Repository : public POA_CosTradingRepos::ServiceTypeRepository { public: /** diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index 1dabb8587b5..f2d907306df 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -25,10 +25,10 @@ #include "ace/Containers.h" -#include "orbsvcs/CosTradingS.h" -#include "orbsvcs/CosTradingReposS.h" -#include "orbsvcs/CosTradingDynamicS.h" -#include "orbsvcs/Trader/trading_serv_export.h" +#include "orbsvcs/orbsvcs/CosTradingS.h" +#include "orbsvcs/orbsvcs/CosTradingReposS.h" +#include "orbsvcs/orbsvcs/CosTradingDynamicS.h" +#include "orbsvcs/orbsvcs/Trader/trading_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -50,7 +50,7 @@ class TAO_Trader_Base; * @brief Uses command line arguments to construct a trader instance with * the correct interface support, locking, and policy settings. */ -class TAO_Trading_Serv_Export TAO_Trader_Factory +class TAO_Trading_Export TAO_Trader_Factory { public: @@ -141,7 +141,7 @@ public: * Contains a reference to the trader from which it is * used so it can use trader's lock. */ -class TAO_Trading_Serv_Export TAO_Support_Attributes_i +class TAO_Trading_Export TAO_Support_Attributes_i { public: // = Initialization and termination methods. @@ -193,7 +193,7 @@ private: * Contains a reference to the trader from which it is * used so it can use trader's lock. */ -class TAO_Trading_Serv_Export TAO_Link_Attributes_i +class TAO_Trading_Export TAO_Link_Attributes_i { public: // = Initialization and termination methods. @@ -224,7 +224,7 @@ private: * Contains a reference to the trader from which it is * used so it can use trader's lock. */ -class TAO_Trading_Serv_Export TAO_Import_Attributes_i +class TAO_Trading_Export TAO_Import_Attributes_i { public: // = Initialization and termination methods. @@ -322,7 +322,7 @@ private: * IDL methods in CosTrading::Trader_Components would need * add a _duplicate call for each get method). */ -class TAO_Trading_Serv_Export TAO_Trading_Components_i +class TAO_Trading_Export TAO_Trading_Components_i { public: @@ -396,7 +396,7 @@ private: * want all these classes to be templatized. TAO_Trader_Base class solves * this problem. */ -class TAO_Trading_Serv_Export TAO_Trader_Base : public TAO_Lockable +class TAO_Trading_Export TAO_Trader_Base : public TAO_Lockable { public: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h index e5740b3dc86..ff646edb63f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h @@ -17,9 +17,9 @@ #include "Constraint_Visitors.h" #include "Trader.h" #include "Trader_Utils.h" -#include "orbsvcs/CosTradingC.h" +#include "orbsvcs/orbsvcs/CosTradingC.h" -class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator +class TAO_Trading_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator { public: /** @@ -38,7 +38,7 @@ class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator : public TAO_Const }; -class TAO_Trading_Serv_Export TAO_Trader_Constraint_Evaluator : public TAO_Constraint_Evaluator +class TAO_Trading_Export TAO_Trader_Constraint_Evaluator : public TAO_Constraint_Evaluator { public: /// Constructor. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index d77b3153669..bd99c2682d8 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -39,7 +39,7 @@ * CORBA sequences, but requires that the client know the layout of * properties ahead of time. */ -class TAO_Trading_Serv_Export TAO_Property_Evaluator +class TAO_Trading_Export TAO_Property_Evaluator { public: @@ -123,7 +123,7 @@ private: * names to integer indicies, upon which lookups are guaranteed to * be O(lg n). */ -class TAO_Trading_Serv_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator +class TAO_Trading_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator { public: @@ -182,7 +182,7 @@ private: * @brief Little helper class that you can extend to have your dynamic * property handler construct CosTradingDynamic::DynamicProp structs. */ -class TAO_Trading_Serv_Export TAO_Dynamic_Property +class TAO_Trading_Export TAO_Dynamic_Property : public virtual POA_CosTradingDynamic::DynamicPropEval, public virtual PortableServer::RefCountServantBase { @@ -496,7 +496,7 @@ private: * interface that helps them build a policy sequence without violating * syntax rules and having to mess with typecodes. */ -class TAO_Trading_Serv_Export TAO_Policy_Creator +class TAO_Trading_Export TAO_Policy_Creator { public: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index 140a025fbe7..4ccc57f7c0e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -486,7 +486,7 @@ TAO_Trading_Loader::parse_args (int &argc, ACE_TCHAR *argv []) return 0; } -ACE_FACTORY_DEFINE (TAO_Trading_Serv, TAO_Trading_Loader) +ACE_FACTORY_DEFINE (TAO_Trading, TAO_Trading_Loader) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index ce679eada06..fb86bce35f1 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -24,11 +24,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/IOR_Multicast.h" -#include "orbsvcs/Trader/Trader.h" -#include "orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/orbsvcs/IOR_Multicast.h" +#include "orbsvcs/orbsvcs/Trader/Trader.h" +#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" -class TAO_Trading_Serv_Export TAO_Trading_Loader : public TAO_Object_Loader +class TAO_Trading_Export TAO_Trading_Loader : public TAO_Object_Loader { public: @@ -106,6 +106,6 @@ public: }; -ACE_FACTORY_DECLARE (TAO_Trading_Serv, TAO_Trading_Loader) +ACE_FACTORY_DECLARE (TAO_Trading, TAO_Trading_Loader) #endif /* TAO_TRADING_LOADER_H */ |