ChangeLogTag:Sat Mar 31 02:06:09 2001 Christopher Kohlhoff <chris@kohlhoff.com>

8 files changed, 84 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ab856a0eff..20ac5e301e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Mar 31 02:06:09 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
+
+        * ace/config-win32-borland.h:
+        * include/makeinclude/ace_flags.bor:
+          Fixed up use of inline functions in DEBUG build.
+
+        * include/makeinclude/ace_flags.bor:
+          Added macros for the TAO_BiDirGIOP and TAO_TypeCodeFactory
+          libraries.
+
 Fri Mar 30 11:17:39 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * bin/fuzz.pl:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 0ab856a0eff..20ac5e301e3 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Sat Mar 31 02:06:09 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
+
+        * ace/config-win32-borland.h:
+        * include/makeinclude/ace_flags.bor:
+          Fixed up use of inline functions in DEBUG build.
+
+        * include/makeinclude/ace_flags.bor:
+          Added macros for the TAO_BiDirGIOP and TAO_TypeCodeFactory
+          libraries.
+
 Fri Mar 30 11:17:39 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * bin/fuzz.pl:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 0ab856a0eff..20ac5e301e3 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Sat Mar 31 02:06:09 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
+
+        * ace/config-win32-borland.h:
+        * include/makeinclude/ace_flags.bor:
+          Fixed up use of inline functions in DEBUG build.
+
+        * include/makeinclude/ace_flags.bor:
+          Added macros for the TAO_BiDirGIOP and TAO_TypeCodeFactory
+          libraries.
+
 Fri Mar 30 11:17:39 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * bin/fuzz.pl:
diff --git a/TAO/tao/BiDir_GIOP/Makefile.bor b/TAO/tao/BiDir_GIOP/Makefile.bor
new file mode 100644
index 00000000000..a0fd68a7711
--- /dev/null
+++ b/TAO/tao/BiDir_GIOP/Makefile.bor
@@ -0,0 +1,28 @@
+#
+# Makefile for building the TAO BiDirGIOP library
+#
+
+NAME = TAO_BiDirGIOP
+
+OBJFILES = \
+	$(OBJDIR)\BiDirGIOP.obj \
+	$(OBJDIR)\BiDirPolicyC.obj \
+	$(OBJDIR)\BiDir_ORBInitializer.obj \
+	$(OBJDIR)\BiDir_PolicyFactory.obj \
+	$(OBJDIR)\BiDir_Policy_i.obj
+
+!ifdef STATIC
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_BIDIRGIOP_CFLAGS)
+!else
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_BIDIRGIOP_CFLAGS) \
+	-DTAO_BIDIRGIOP_BUILD_DLL
+!endif
+
+CPPDIR = .
+
+INCDIR_NAME = tao\BiDir_GIOP
+INCLUDES = *.h *.i *.inl BiDirPolicy.pidl
+
+LIBFILES = $(ACE_LIB) $(TAO_LIB)
+
+!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index 98ec17ffdca..99fe2ff053b 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -8,13 +8,14 @@ DIRS = \
 	PortableServer \
 	DynamicAny \
 	DynamicInterface \
+	BiDir_GIOP \
 	IORTable \
 	IORManipulation \
 	Strategies \
-        IFR_Client \
-        Domain \
-        TypeCodeFactory \
-        SmartProxies
+	IFR_Client \
+	Domain \
+	TypeCodeFactory \
+	SmartProxies
 
 OBJFILES = \
 	$(OBJDIR)\Abstract_Servant_Base.obj \
@@ -26,10 +27,7 @@ OBJFILES = \
 	$(OBJDIR)\Asynch_Invocation.obj \
 	$(OBJDIR)\Asynch_Reply_Dispatcher.obj \
 	$(OBJDIR)\Asynch_Timeout_Handler.obj \
-	$(OBJDIR)\BiDir_ORBInitializer.obj \
-	$(OBJDIR)\BiDir_Policy_i.obj \
-	$(OBJDIR)\BiDir_PolicyFactory.obj \
-	$(OBJDIR)\BiDirPolicyC.obj \
+	$(OBJDIR)\BiDir_Adapter.obj \
 	$(OBJDIR)\Bind_Dispatcher_Guard.obj \
 	$(OBJDIR)\BoundsC.obj \
 	$(OBJDIR)\Buffering_Constraint_Policy.obj \
@@ -82,8 +80,8 @@ OBJFILES = \
 	$(OBJDIR)\GIOP_Message_State.obj \
 	$(OBJDIR)\GIOP_Utils.obj \
 	$(OBJDIR)\GIOPC.obj \
-        $(OBJDIR)\IFR_TypeCodes.obj \
-        $(OBJDIR)\IFR_Client_Adapter.obj \
+	$(OBJDIR)\IFR_TypeCodes.obj \
+	$(OBJDIR)\IFR_Client_Adapter.obj \
 	$(OBJDIR)\IIOPC.obj \
 	$(OBJDIR)\IIOP_Acceptor.obj \
 	$(OBJDIR)\IIOP_Connection_Handler.obj \
@@ -170,7 +168,7 @@ OBJFILES = \
 	$(OBJDIR)\Services.obj \
 	$(OBJDIR)\Services_Activate.obj \
 	$(OBJDIR)\Service_Callbacks.obj \
-        $(OBJDIR)\Service_Context.obj \
+	$(OBJDIR)\Service_Context.obj \
 	$(OBJDIR)\Single_Reactor.obj \
 	$(OBJDIR)\skip.obj \
 	$(OBJDIR)\Stub.obj \
@@ -188,6 +186,7 @@ OBJFILES = \
 	$(OBJDIR)\Transport_Mux_Strategy.obj \
 	$(OBJDIR)\Typecode.obj \
 	$(OBJDIR)\Typecode_Constants.obj \
+	$(OBJDIR)\TypeCodeFactory_Adapter.obj \
 	$(OBJDIR)\Base_Transport_Property.obj \
 	$(OBJDIR)\ValueBase.obj \
 	$(OBJDIR)\ValueFactory.obj \
diff --git a/TAO/tao/TypeCodeFactory/Makefile.bor b/TAO/tao/TypeCodeFactory/Makefile.bor
index c0e02b9e520..ec130cdb7e6 100644
--- a/TAO/tao/TypeCodeFactory/Makefile.bor
+++ b/TAO/tao/TypeCodeFactory/Makefile.bor
@@ -8,21 +8,24 @@ OBJFILES = \
 	$(OBJDIR)\TypeCodeFactoryC.obj \
 	$(OBJDIR)\TypeCodeFactory_i.obj \
 	$(OBJDIR)\TypeCodeFactory_Loader.obj \
-        $(OBJDIR)\TypeCodeFactory_Adapter_Impl.obj
+	$(OBJDIR)\TypeCodeFactory_Adapter_Impl.obj
 
 !ifdef STATIC
-TCF_DLLFLAG=0
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+	$(TAO_PORTABLESERVER_CFLAGS) \
+	$(TAO_IFR_CLIENT_CFLAGS) \
+	$(TAO_TYPECODEFACTORY_CFLAGS)
 !else
-TCF_DLLFLAG=1
-!endif
-
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
 	$(TAO_PORTABLESERVER_CFLAGS) \
 	$(TAO_IFR_CLIENT_CFLAGS) \
-	-DTCF_HAS_DLL=$(TCF_DLLFLAG) \
-	-DTCF_BUILD_DLL
+	$(TAO_TYPECODEFACTORY_CFLAGS) \
+	-DTAO_TYPECODEFACTORY_BUILD_DLL=1
+!endif
 
 CPPDIR = .
 
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index d2cafc805e6..d1ac479bd4c 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -31,7 +31,7 @@
 // default. The debug configuration of ACE is built with functions
 // out-of-line, so when linking your application against a debug ACE
 // build, you can choose to use the out-of-line functions by adding
-// __ACE_INLINE__=0 to your project settings.
+// ACE_NO_INLINE=1 to your project settings.
 #  if !defined (__ACE_INLINE__)
 #   define __ACE_INLINE__ 1
 #  endif /* __ACE_INLINE__ */
diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor
index cf5087c5b31..00eec4a5124 100644
--- a/include/makeinclude/ace_flags.bor
+++ b/include/makeinclude/ace_flags.bor
@@ -15,7 +15,7 @@ DLL_NAME=dll
 # Compiler flags
 #
 !ifdef DEBUG
-ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_OS_HAS_DLL=$(DLL_FLAG) -D__ACE_INLINE__=0
+ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_OS_HAS_DLL=$(DLL_FLAG) -DACE_NO_INLINE=1
 !else
 ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_OS_HAS_DLL=$(DLL_FLAG)
 !endif
@@ -29,12 +29,14 @@ TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=$(DLL_FLAG)
 TAO_DOMAIN_FLAGS = -I$(ACE_ROOT)\TAO -DTAO_DOMAIN_HAS_DLL=$(DLL_FLAG)
 TAO_DYNAMICANY_CFLAGS =	-I$(ACE_ROOT)\TAO -DTAO_DYNAMICANY_HAS_DLL=$(DLL_FLAG)
 TAO_DYNAMICINTERFACE_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_DYNAMICINTERFACE_HAS_DLL=$(DLL_FLAG)
+TAO_BIDIRGIOP_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_BIDIRGIOP_HAS_DLL=$(DLL_FLAG)
 TAO_IFR_CLIENT_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_IFR_CLIENT_HAS_DLL=$(DLL_FLAG)
 TAO_STRATEGIES_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_STRATEGIES_HAS_DLL=$(DLL_FLAG)
 TAO_PORTABLESERVER_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_PORTABLESERVER_HAS_DLL=$(DLL_FLAG)
 TAO_IORMANIP_CFLAGS = -I$(ACE_ROOT)\TAO	-DTAO_IORMANIP_HAS_DLL=$(DLL_FLAG)
 TAO_IORTABLE_CFLAGS = -I$(ACE_ROOT)\TAO	-DTAO_IORTABLE_HAS_DLL=$(DLL_FLAG)
 TAO_SMARTPROXIES_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_SMARTPROXIES_HAS_DLL=$(DLL_FLAG)
+TAO_TYPECODEFACTORY_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_TYPECODEFACTORY_HAS_DLL=$(DLL_FLAG)
 TAO_IDL_BE_CFLAGS = -I$(ACE_ROOT)\TAO\TAO_IDL -I$(ACE_ROOT)\TAO\TAO_IDL\be_include \
 	-DTAO_IDL_BE_HAS_DLL=$(DLL_FLAG)
 TAO_IDL_FE_CFLAGS = -I$(ACE_ROOT)\TAO\TAO_IDL -I$(ACE_ROOT)\TAO\TAO_IDL\fe \
@@ -74,12 +76,14 @@ TAO_LIB	= $(CORE_BINDIR)\TAO$(LIB_DECORATOR).lib
 TAO_DOMAIN_LIB = $(CORE_BINDIR)\TAO_Domain$(LIB_DECORATOR).lib
 TAO_DYNAMICANY_LIB = $(CORE_BINDIR)\TAO_DynamicAny$(LIB_DECORATOR).lib
 TAO_DYNAMICINTERFACE_LIB = $(CORE_BINDIR)\TAO_DynamicInterface$(LIB_DECORATOR).lib
+TAO_BIDIRGIOP_LIB = $(CORE_BINDIR)\TAO_BiDirGIOP$(LIB_DECORATOR).lib
 TAO_IFR_CLIENT_LIB = $(CORE_BINDIR)\TAO_IFR_Client$(LIB_DECORATOR).lib
 TAO_PORTABLESERVER_LIB = $(CORE_BINDIR)\TAO_PortableServer$(LIB_DECORATOR).lib
 TAO_STRATEGIES_LIB = $(CORE_BINDIR)\TAO_Strategies$(LIB_DECORATOR).lib
 TAO_IORMANIP_LIB = $(CORE_BINDIR)\TAO_IORManip$(LIB_DECORATOR).lib
 TAO_IORTABLE_LIB = $(CORE_BINDIR)\TAO_IORTable$(LIB_DECORATOR).lib
 TAO_SMARTPROXIES_LIB = $(CORE_BINDIR)\TAO_SmartProxies$(LIB_DECORATOR).lib
+TAO_TYPECODEFACTORY_LIB = $(CORE_BINDIR)\TAO_TypeCodeFactory$(LIB_DECORATOR).lib
 TAO_IDL_BE_LIB = $(CORE_BINDIR)\TAO_IDL_BE$(LIB_DECORATOR).lib
 TAO_IDL_FE_LIB = $(CORE_BINDIR)\TAO_IDL_FE$(LIB_DECORATOR).lib
 TAO_SVC_UTILS_LIB = $(CORE_BINDIR)\TAO_Svc_Utils$(LIB_DECORATOR).lib