ChangeLogTag: Fri Jun 20 17:17:57 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

7 files changed, 46 insertions, 21 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 73ebec076bf..d8c2cf9bae8 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,18 @@
+Fri Jun 20 17:17:57 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Basic_Argument_T.h:
+        * tao/Basic_Arguments.h:
+        * tao/UB_String_Argument_T.h:
+        * tao/UB_String_Arguments.h:
+
+          Made sure at least one significant included file appears before
+          the '#pragma once' directive.
+
+        * tao/Makefile.bor:
+        * tao/Makefile.tao:
+
+          Added new files to the makefiles.
+
 Fri Jun 20 16:09:52 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Argument.cpp:
diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h
index 9dcae9db3fb..2655bdcbcb7 100644
--- a/TAO/tao/Basic_Argument_T.h
+++ b/TAO/tao/Basic_Argument_T.h
@@ -15,13 +15,12 @@
 #define TAO_BASIC_ARGUMENT_T_H
 
 #include "ace/pre.h"
+#include "tao/Argument.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Argument.h"
-
 namespace TAO
 {
   /**
diff --git a/TAO/tao/Basic_Arguments.h b/TAO/tao/Basic_Arguments.h
index e8a58e70844..1137b38fe91 100644
--- a/TAO/tao/Basic_Arguments.h
+++ b/TAO/tao/Basic_Arguments.h
@@ -15,13 +15,12 @@
 #define TAO_BASIC_ARGUMENTS_H
 
 #include "ace/pre.h"
+#include "Basic_Argument_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Basic_Argument_T.h"
-
 namespace TAO
 {
   /**
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index 55003ad884f..f310de684d9 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -5,11 +5,11 @@
 NAME = TAO
 
 DIRS = \
-   Valuetype \
-   ObjRefTemplate \
-   IORInterceptor \
+  Valuetype \
+  ObjRefTemplate \
+  IORInterceptor \
 	PortableServer \
-   Messaging \
+  Messaging \
 	DynamicAny \
 	DynamicInterface \
 	BiDir_GIOP \
@@ -29,10 +29,12 @@ OBJFILES = \
 	$(OBJDIR)\Acceptor_Registry.obj \
 	$(OBJDIR)\Adapter.obj \
 	$(OBJDIR)\Any.obj \
+	$(OBJDIR)\Argument.obj \
 	$(OBJDIR)\Asynch_Invocation.obj \
 	$(OBJDIR)\Asynch_Queued_Message.obj \
-   $(OBJDIR)\Asynch_Reply_Dispatcher_Base.obj \
+  $(OBJDIR)\Asynch_Reply_Dispatcher_Base.obj \
 	$(OBJDIR)\Base_Transport_Property.obj \
+	$(OBJDIR)\Basic_Arguments.obj \
 	$(OBJDIR)\BiDir_Adapter.obj \
 	$(OBJDIR)\Bind_Dispatcher_Guard.obj \
 	$(OBJDIR)\Block_Flushing_Strategy.obj \
@@ -53,8 +55,8 @@ OBJFILES = \
 	$(OBJDIR)\Client_Strategy_Factory.obj \
 	$(OBJDIR)\CodecFactory.obj \
 	$(OBJDIR)\CodecFactory_ORBInitializer.obj \
-   $(OBJDIR)\Codeset_Manager.obj \
-   $(OBJDIR)\Codeset_Translator_Factory.obj \
+  $(OBJDIR)\Codeset_Manager.obj \
+  $(OBJDIR)\Codeset_Translator_Factory.obj \
 	$(OBJDIR)\Collocation_Resolver.obj \
 	$(OBJDIR)\Connect_Strategy.obj \
 	$(OBJDIR)\Default_Collocation_Resolver.obj \
@@ -97,8 +99,8 @@ OBJFILES = \
 	$(OBJDIR)\GIOP_Utils.obj \
 	$(OBJDIR)\IFR_Client_Adapter.obj \
 	$(OBJDIR)\IIOPC.obj \
-   $(OBJDIR)\IOP_CodecC.obj \
-   $(OBJDIR)\IOP_IORC.obj \
+  $(OBJDIR)\IOP_CodecC.obj \
+  $(OBJDIR)\IOP_IORC.obj \
 	$(OBJDIR)\IIOP_Acceptor.obj \
 	$(OBJDIR)\IIOP_Connection_Handler.obj \
 	$(OBJDIR)\IIOP_Connector.obj \
@@ -133,8 +135,8 @@ OBJFILES = \
 	$(OBJDIR)\Managed_Types.obj \
 	$(OBJDIR)\Marshal.obj \
 	$(OBJDIR)\MCAST_Parser.obj \
-   $(OBJDIR)\Messaging_PolicyValueC.obj \
-   $(OBJDIR)\Messaging_SyncScopeC.obj \
+  $(OBJDIR)\Messaging_PolicyValueC.obj \
+  $(OBJDIR)\Messaging_SyncScopeC.obj \
 	$(OBJDIR)\Muxed_TMS.obj \
 	$(OBJDIR)\NVList.obj \
 	$(OBJDIR)\ORB.obj \
@@ -179,7 +181,7 @@ OBJFILES = \
 	$(OBJDIR)\Remote_Object_Proxy_Impl.obj \
 	$(OBJDIR)\Reply_Dispatcher.obj \
 	$(OBJDIR)\RequestInfo_Util.obj \
-        $(OBJDIR)\Request_Dispatcher.obj \
+  $(OBJDIR)\Request_Dispatcher.obj \
 	$(OBJDIR)\Resource_Factory.obj \
 	$(OBJDIR)\Resume_Handle.obj \
 	$(OBJDIR)\Sequence.obj \
@@ -188,6 +190,7 @@ OBJFILES = \
 	$(OBJDIR)\Service_Context.obj \
 	$(OBJDIR)\ServicesC.obj \
 	$(OBJDIR)\Services_Activate.obj \
+	$(OBJDIR)\Special_Basic_Arguments.obj \
 	$(OBJDIR)\StringSeqC.obj \
 	$(OBJDIR)\Stub.obj \
 	$(OBJDIR)\Stub_Factory.obj \
@@ -214,6 +217,7 @@ OBJFILES = \
 	$(OBJDIR)\TypeCodeFactory_Adapter.obj \
 	$(OBJDIR)\Typecode.obj \
 	$(OBJDIR)\Typecode_Constants.obj \
+	$(OBJDIR)\UB_String_Arguments.obj \
 	$(OBJDIR)\Valuetype_Adapter.obj \
 	$(OBJDIR)\Wait_On_Leader_Follower.obj \
 	$(OBJDIR)\Wait_On_Reactor.obj \
diff --git a/TAO/tao/Makefile.tao b/TAO/tao/Makefile.tao
index 7f02bc8a0e6..55cce10d9ce 100644
--- a/TAO/tao/Makefile.tao
+++ b/TAO/tao/Makefile.tao
@@ -299,7 +299,12 @@ ORB_CORE_FILES = \
   Request_Dispatcher \
   Valuetype_Adapter \
   ObjectKey_Table \
-  Refcounted_ObjectKey
+  Refcounted_ObjectKey \
+  Argument \
+  Basic_Arguments \
+  Special_Basic_Arguments \
+  UB_String_Arguments
+
 
 DYNAMIC_ANY_FILES =
 
@@ -322,6 +327,11 @@ TEMPLATE_FILES = \
   Seq_Var_T \
   Value_VarOut_T \
   VarOut_T \
+  Basic_Argument_T \
+  BD_String_Argument_T \
+  Object_Argument_T \
+  Special_Basic_Argument_T \
+  UB_String_Argument_T \
   TAO_Singleton
 
 ifndef TAO_ROOT
diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h
index 0c01187f8cc..7270e274a08 100644
--- a/TAO/tao/UB_String_Argument_T.h
+++ b/TAO/tao/UB_String_Argument_T.h
@@ -15,13 +15,12 @@
 #define TAO_UB_STRING_ARGUMENT_T_H
 
 #include "ace/pre.h"
+#include "tao/Argument.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Argument.h"
-
 namespace TAO
 {
   /**
diff --git a/TAO/tao/UB_String_Arguments.h b/TAO/tao/UB_String_Arguments.h
index ea9ec679c79..5e148bf3e5a 100644
--- a/TAO/tao/UB_String_Arguments.h
+++ b/TAO/tao/UB_String_Arguments.h
@@ -15,13 +15,12 @@
 #define TAO_UB_STRING_ARGUMENTS_H
 
 #include "ace/pre.h"
+#include "UB_String_Argument_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "UB_String_Argument_T.h"
-
 namespace TAO
 {
   /**