Hopefully fixed the problem with exporting variables from DLLs on NT.

1 files changed, 65 insertions, 53 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 2af2eeaf859..1d7203b2df6 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,15 @@
+Sun Jul  5 21:22:42 1998  Darrell Brunsch <brunsch@cs.wustl.edu>
+
+	* tao/orbconf.h: Undid the change I made on July 3.  Although it
+	  fixed the one problem I was looking at, it broke everything 
+	  else.  Oops.
+
+	* TAO_IDL/be/be_codegen.cpp: Changed the TAO_EXPORT_MACRO 
+	  definition to override any that came before.  Without this the
+	  ordering of includes (putting corba.h before an orbsvc, such as
+	  CosNamingC.h) would break in certain configurations.  Also moved
+	  it after the includes so it shouldn't affect included files.
+
 Sat Jul  4 01:18:21 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp:
@@ -7,7 +19,7 @@ Sat Jul  4 01:18:21 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
 	* orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp:
 	* orbsvcs/orbsvcs/Trader/Trader.{h,cpp}:
 	* orbsvcs/orbsvcs/Trader/Trader_Utils.cpp:	
-	Addressed warnings/errors on IRIX.
+	  Addressed warnings/errors on IRIX.
 
 Fri Jul 03 21:51:44 1998  David L. Levine  <levine@cs.wustl.edu>
 
@@ -28,11 +40,11 @@ Fri Jul  3 18:40:46 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
 
         * orbsvcs/orbsvcs/Trader/Trader_Interfaces.{h,cpp}:
         * orbsvcs/orbsvcs/Trader/Trader_Utils.{h,cpp}:
-        Debugged and tested directed queries.
+          Debugged and tested directed queries.
 
         * orbsvcs/tests/Trading/Offer_Importer.{h,cpp}:
         * orbsvcs/tests/Trading/import_test.cpp:
-        Added code to test directed queries.
+          Added code to test directed queries.
 
 Fri Jul 03 17:30:00 1998  Michael Kircher  <mk1@cs.wustl.edu>
 
@@ -123,14 +135,14 @@ Fri Jul  3 00:39:03 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
         * orbsvcs/orbsvcs/Trader/Trader.{h,cpp}:
         * orbsvcs/orbsvcs/Trader/Trader_Interfaces.{h,cpp}:
         * orbsvcs/orbsvcs/Trader/Trader_Utils.{h,cpp}:
-        Added code to sort by preference the merged result sequence of a
-        federated query.
+          Added code to sort by preference the merged result sequence of a
+          federated query.
 
 Thu Jul  2 19:41:46 1998  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
         * tests/Param_Test/Makefile:
         * tests/Cubit/TAO/IDL_Cubit/Makefile: Added TAO_IDLFLAGS -P to enable
-        Perfect-hashed-operation-lookup strategy for the idl compiler.
+          Perfect-hashed-operation-lookup strategy for the idl compiler.
 
 Thu Jul  2 19:22:24 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
@@ -158,7 +170,7 @@ Thu Jul  2 14:28:01 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
         * TAO_IDL/be/be_array.cpp: We were generating incorrect code for
         the out () and _retn () methods of the Array_var class.
 
-        * TAO_IDL/be_include/be.h" Missing #include for Process.h added.
+        * TAO_IDL/be_include/be.h: Missing #include for Process.h added.
 
         * TAO_IDL/Makefile: Ran make depend
 
@@ -168,17 +180,17 @@ Thu Jul  2 12:36:28 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
 
         * orbsvcs/orbsvcs/Trader/Trader[_T].{h,cpp}:
         * orbsvcs/orbsvcs/Trader/Constraint_Visitors.{h,cpp}:
-        For the 'in' operator in the standard OMG constraint language, the
-        Constraint Interpreter needs to identify and extract from Anys
-        sequences of primitive types, regardless of how many times the
-        sequence has been typedef'd. Added code to do this.
+          For the 'in' operator in the standard OMG constraint language, the
+          Constraint Interpreter needs to identify and extract from Anys
+          sequences of primitive types, regardless of how many times the
+          sequence has been typedef'd. Added code to do this.
 
         * orbsvcs/tests/Trading/TTest.idl:
         * orbsvcs/tests/Trading/TT_Info.cpp:
         * orbsvcs/tests/Trading/Service_Type_Exporter.cpp:
         * orbsvcs/tests/Trading/Offer_Exporter.cpp:
-        Now sends aliased sequences to the Trader to test the above
-        enhancement.
+          Now sends aliased sequences to the Trader to test the above
+          enhancement.
 
 Thu Jul  2 12:29:10 1998  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
@@ -222,14 +234,14 @@ Wed Jul  1 22:42:13 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
 
         * orbsvcs/orbsvcs/Makefile:
         * orbsvcs/orbsvcs/CosTrading.idl:
-        Merged Sequences.idl into CosTrading.idl.
+          Merged Sequences.idl into CosTrading.idl.
 
         * orbsvcs/orbsvcs/Trader/Trader.{h,cpp}:
         * orbsvcs/orbsvcs/Trader/Trader_T.{h,cpp}:
         * orbsvcs/orbsvcs/Trader/Trader_Utils.{h,cpp}:
         * orbsvcs/orbsvcs/Trader/Trader_Interfaces.{h,cpp}:
-        Addressed DEC cxx warnings/errors. Hopefully solved some, probbaly
-        introduced more.
+          Addressed DEC cxx warnings/errors. Hopefully solved some, probbaly
+          introduced more.
 
 Wed Jul 01 21:14:11 1998  David L. Levine  <levine@cs.wustl.edu>
 
@@ -261,56 +273,56 @@ Wed Jul  1 13:59:30 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
         * orbsvcs/LifeCycle_Service/Makefile: Removed STL flags.
 
         * tao/TAO.{h,cpp}: Passing in argc to the TAO_ORB_Manager by
-        reference, since ORB_init takes argc by reference.
+          reference, since ORB_init takes argc by reference.
 
         * orbsvcs/Trading_Service/Trading_Service.{h,cpp}:
         * orbsvcs/Trading_Service/Makefile:
-        Made Trading Service app resemble other orbsvcs apps. Accepts -TS*
-        command line arguments. Has the ability to form a complete graph
-        federation with other traders on the same multicast network.
+          Made Trading Service app resemble other orbsvcs apps. Accepts -TS*
+          command line arguments. Has the ability to form a complete graph
+          federation with other traders on the same multicast network.
 
         * orbsvcs/tests/Trading/Offer_Exporter.{h,cpp}:
         * orbsvcs/tests/Trading/Offer_Importer.{h,cpp}:
         * orbsvcs/tests/Trading/Service_Type_Exporter.{h,cpp}:
         * orbsvcs/tests/Trading/export_test.cpp:
         * orbsvcs/tests/Trading/Makfile:
-        export_test will now export service types and offers to all
-        traders linked to the multicast-enabled trader, so import_test
-        will test federated queries.
+          export_test will now export service types and offers to all
+          traders linked to the multicast-enabled trader, so import_test
+          will test federated queries.
 
         * orbsvcs/orbsvcs/IOR_Multicast.{h,cpp}: Added an init method for
-        initialization outside the constructor.
+          initialization outside the constructor.
 
         * orbsvcs/orbsvcs/Makefile: Changed macro name from
-        TAO_HAS_DYNAMIC_PROPERTY_BUG to TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG.
+          TAO_HAS_DYNAMIC_PROPERTY_BUG to TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG.
 
         * orbsvcs/orbsvcs/Trader/*.*:
-        o  Hopefully fixed DEC cxx errors/warnings.
-        o  Added command-line configuration of trader policies, interfaces,
-        and multithreading support.
-        o  Debugged link interface and federated queries.
-        o  Added explicit template specialization.
+          o  Hopefully fixed DEC cxx errors/warnings.
+          o  Added command-line configuration of trader policies, interfaces,
+             and multithreading support.
+          o  Debugged link interface and federated queries.
+          o  Added explicit template specialization.
 
 Wed Jul  1 1:55:23 1998 Jeff Parsons <jp4@cs.wustl.edu>
 
         * TAO/tests/Cubit/TAO/DII_Cubit/Makefile: It works, at least with
-        SunCC. It builds the DII client and also the IDL server if
-        necessary (since we run it before running client.exe) -thanks
-        to David Levine for that.
+          SunCC. It builds the DII client and also the IDL server if
+          necessary (since we run it before running client.exe) -thanks
+          to David Levine for that.
         * TAO/tests/Cubit/TAO/DII_Cubit/client.h, cpp: Now builds and
-        executes on Unix and NT. Also added some macros for the
-        environment checking inside the operations.
+          executes on Unix and NT. Also added some macros for the
+          environment checking inside the operations.
 
 Wed Jul  1 10:28:07 1998  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
         * TAO_IDL/be_include/be_interface.h (be_type): Fixed the warnings
-        in g++.
+          in g++.
 
 Wed Jul  1 06:36:11 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
 
         * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp: For the copying
-        version of the <<= operator, we were not doing a copy. Thanks to
-        Seth Widoff for pointing this out.
+          version of the <<= operator, we were not doing a copy. Thanks to
+          Seth Widoff for pointing this out.
 
 Tue Jun 30 22:08:38 1998  David L. Levine  <levine@cs.wustl.edu>
 
@@ -326,7 +338,7 @@ Tue Jun 30 18:27:49 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 Tue Jun 30 18:21:04 1998  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
 
         * tests/Quoter/Makefile:
-        Removed STL includes --- no longer needed for Trading Service.
+          Removed STL includes --- no longer needed for Trading Service.
 
 Tue Jun 30 16:50:12 1998  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
@@ -337,20 +349,20 @@ Tue Jun 30 16:50:12 1998  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
         IDL-Attributes are not supported yet.
 
         * TAO_IDL/driver/drv_args.cpp: Added option -P to enable
-        PERFECT_HASH operation lookup strategy.
+          PERFECT_HASH operation lookup strategy.
 
         * TAO_IDL/be_include/be_interface.h: Added methods to generate
-        perfect hashing operation lookup table in the server skeleton
-        code.
+          perfect hashing operation lookup table in the server skeleton
+          code.
 
         * TAO_IDL/be_include/be_helper.h (class TAO_OutStream): Added a
-        new stream type GPERF_INPUT to indicate the outstream is for
-        gperf's input file.
+          new stream type GPERF_INPUT to indicate the outstream is for
+          gperf's input file.
 
         * TAO_IDL/be_include/be_codegen.h (class TAO_CodeGen):  Added <enum
-        LOOKUP_STRATEGY {...}> to indicate various lookup
-        strategies. Added the member and access methods that keeps track
-        of the TAO_OutStream that corresponds to the gperf's input file.
+          LOOKUP_STRATEGY {...}> to indicate various lookup
+          strategies. Added the member and access methods that keeps track
+          of the TAO_OutStream that corresponds to the gperf's input file.
 
         * TAO_IDL/be_include/be.h: Included "ace/Process.h".
 
@@ -362,8 +374,8 @@ Tue Jun 30 16:50:12 1998  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
         * tao/Operation_Table.h (TAO_Perfect_Hash_OpTable):
         * tao/Operation_Table.cpp :
-                Defined the class TAO_Perfect_Hash_OpTable, the factory
-        class for Perfect_Hashing-Operation_Lookup strategy.
+          Defined the class TAO_Perfect_Hash_OpTable, the factory
+          class for Perfect_Hashing-Operation_Lookup strategy.
 
 Tue Jun 30 13:23:59 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
@@ -419,10 +431,10 @@ Mon Jun 29 11:00:26 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
 
         * TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
 
-        After the call to do_static_call, we were not checking if some
-        exception was raised. This was causing major problems if there was
-        any post do_static_call processing such as narrowing to be
-        done. Thanks to Seth Widoff for reporting the problem.
+          After the call to do_static_call, we were not checking if some
+          exception was raised. This was causing major problems if there was
+          any post do_static_call processing such as narrowing to be
+          done. Thanks to Seth Widoff for reporting the problem.
 
 Sun Jun 28 21:33:48 1998  David L. Levine  <levine@cs.wustl.edu>