ChangeLogTag: Fri May 2 000:42:11 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

34 files changed, 183 insertions, 90 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 4e109d82fcb..dea01cc0087 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,44 @@
+Fri May  2 000:42:11 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * rules.tao.GNU:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+        * TAO_IDL/be_include/be_global.h
+        * tests/OBV/Any/Makefile:
+        * tests/OBV/Any/client.bor:
+        * tests/OBV/Any/client.dsp:
+        * tests/OBV/Any/server.bor:
+        * tests/OBV/Any/server.dsp:
+        * tests/OBV/Factory/Makefile:
+        * tests/OBV/Factory/client.bor:
+        * tests/OBV/Factory/client.dsp:
+        * tests/OBV/Factory/server.bor:
+        * tests/OBV/Factory/server.dsp:
+        * tests/OBV/Forward/Makefile:
+        * tests/OBV/Forward/client.bor:
+        * tests/OBV/Forward/client.dsp:
+        * tests/OBV/Forward/server.bor:
+        * tests/OBV/Forward/server.dsp:
+        * tests/OBV/TC_Alignment/Makefile:
+        * tests/OBV/TC_Alignment/client.bor:
+        * tests/OBV/TC_Alignment/client.dsp:
+        * tests/OBV/TC_Alignment/server.bor:
+        * tests/OBV/TC_Alignment/server.dsp:
+
+	  Updated rules.tao.GNU and the tests in the 
+	  TAO/tests/OBV directory to work with the
+	  new Valuetype library. Also substituted ptrdiff_t
+	  for ptr_arith_t in TAO_IDL.
+
 Thu May  1 20:24:13 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be_include/be_helper.h:
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 60f61b7d43f..fc6a7227f61 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -201,6 +201,16 @@ TAO_CodeGen::start_client_header (const char *fname)
                                       "tao/SmartProxies/Smart_Proxies.h");
         }
 
+      if (be_global->valuetype_seen ())
+        {
+          this->gen_standard_include (this->client_header_,
+                                      "tao/Valuetype/ValueBase.h");
+          this->gen_standard_include (this->client_header_,
+                                      "tao/Valuetype/ValueFactory.h");
+          this->gen_standard_include (this->client_header_,
+                                      "tao/Valuetype/Valuetype_Adapter_Impl.h");
+        }
+
       size_t nfiles = idl_global->n_included_idl_files ();
 
       if (nfiles > 0)
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 994412c6469..f941c87aeef 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -73,7 +73,8 @@ BE_GlobalData::BE_GlobalData (void)
     gen_inline_constants_ (I_FALSE),
     lookup_strategy_ (TAO_PERFECT_HASH),
     void_type_ (0),
-    ccmobject_ (0)
+    ccmobject_ (0),
+    valuetype_seen_ (I_FALSE)
 {
 }
 
@@ -891,3 +892,15 @@ BE_GlobalData::ccmobject (be_interface *val)
   this->ccmobject_ = val;
 }
 
+idl_bool
+BE_GlobalData::valuetype_seen (void) const
+{
+  return this->valuetype_seen_;
+}
+
+void
+BE_GlobalData::valuetype_seen (idl_bool val)
+{
+  this->valuetype_seen_ = val;
+}
+
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index c5d6b6d4b0e..b738763b954 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -2107,7 +2107,7 @@ be_interface::queryinterface_helper (be_interface *derived,
   // Emit the comparison code.
   *os << "(type == ACE_reinterpret_cast ("
       << be_idt << be_idt <<be_idt << be_idt << be_idt << be_idt_nl
-      << "ptr_arith_t," << be_nl;
+      << "ptrdiff_t," << be_nl;
 
   be_decl *scope =
     be_scope::narrow_from_scope (ancestor->defined_in ())->decl ();
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
index e3a1a2465ec..a9ec037819a 100644
--- a/TAO/TAO_IDL/be/be_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype.cpp
@@ -25,6 +25,7 @@
 #include "ast_module.h"
 #include "idl_defines.h"
 #include "nr_extern.h"
+#include "global_extern.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID (be,
@@ -47,6 +48,7 @@ be_valuetype::be_valuetype (void)
 
   // Always the case.
   this->has_constructor (I_TRUE);
+  be_global->valuetype_seen (I_TRUE);
 }
 
 // Constructor used to build the AST.
@@ -117,6 +119,11 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
           break;
         }
     }
+
+  if (! idl_global->imported ())
+    {
+      be_global->valuetype_seen (I_TRUE);
+    }
 }
 
 be_valuetype::~be_valuetype (void)
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
index 7fccf516366..ff7799579f1 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
@@ -219,7 +219,7 @@ be_visitor_component_ch::visit_component (be_component *node)
 
   // The _tao_QueryInterface method.
   *os << be_nl << be_nl
-      << "virtual void *_tao_QueryInterface (ptr_arith_t type);";
+      << "virtual void *_tao_QueryInterface (ptrdiff_t type);";
 
   // The _interface_repository_id method.
   *os << be_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
index 8573bdbcf6d..0c372a0bd83 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
@@ -333,7 +333,7 @@ be_visitor_component_cs::visit_component (be_component *node)
 
   // Generating _tao_QueryInterface method.
   *os << "void *" << node->full_name ()
-      << "::_tao_QueryInterface (ptr_arith_t type)" << be_nl
+      << "::_tao_QueryInterface (ptrdiff_t type)" << be_nl
       << "{" << be_idt_nl
       << "void *retv = 0;" << be_nl << be_nl
       << "if ";
@@ -352,7 +352,7 @@ be_visitor_component_cs::visit_component (be_component *node)
 
   *os << "(type == ACE_reinterpret_cast ("
       << be_idt << be_idt << be_idt << be_idt << be_idt << be_idt_nl
-      << " ptr_arith_t," << be_nl;
+      << " ptrdiff_t," << be_nl;
 
   if (node->is_abstract ())
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index 436ae255657..3c6964db80e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -289,7 +289,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     }
 
   // The _tao_QueryInterface method.
-  *os << "virtual void *_tao_QueryInterface (ptr_arith_t type);"
+  *os << "virtual void *_tao_QueryInterface (ptrdiff_t type);"
       << be_nl << be_nl;
 
   // The _interface_repository_id method.
@@ -301,10 +301,10 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
   if (node->is_abstract ())
     {
       *os << be_nl << be_nl
-          << "virtual void *_tao_obv_narrow (ptr_arith_t type_id);"
+          << "virtual void *_tao_obv_narrow (ptrdiff_t type_id);"
           << "\n#if defined (_MSC_VER)" << be_nl
           << "virtual void *" << node->flat_name ()
-          << "_tao_obv_narrow (ptr_arith_t type_id);"
+          << "_tao_obv_narrow (ptrdiff_t type_id);"
           << "\n#endif /* _MSC_VER */";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 0437ece347e..25e4bde80c4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -419,23 +419,23 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "return " << node->local_name () << "::_nil ();" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl
           << "return (" << node->local_name ()
-          << "_ptr) abs->_tao_obv_narrow ((ptr_arith_t) &_downcast);"
+          << "_ptr) abs->_tao_obv_narrow ((ptrdiff_t) &_downcast);"
           << be_uidt_nl
           << "}" << be_nl << be_nl;
 
       *os << "\n#if defined (_MSC_VER)" << be_nl
           << "void *" << be_nl
           << node->name () << "::" << node->flat_name ()
-          << "_tao_obv_narrow (ptr_arith_t type_id)" << be_nl
+          << "_tao_obv_narrow (ptrdiff_t type_id)" << be_nl
           << "{" << be_idt_nl
           << "return this->_tao_obv_narrow (type_id);" << be_uidt_nl
           << "}"
           << "\n#endif /* _MSC_VER */" << be_uidt_nl << be_nl
           << "void *" << be_nl
           << node->full_name ()
-          << "::_tao_obv_narrow (ptr_arith_t type_id)" << be_nl
+          << "::_tao_obv_narrow (ptrdiff_t type_id)" << be_nl
           << "{" << be_idt_nl
-          << "if (type_id == (ptr_arith_t) &_downcast)" << be_idt_nl
+          << "if (type_id == (ptrdiff_t) &_downcast)" << be_idt_nl
           << "{" << be_idt_nl
           << "return this;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl
@@ -563,7 +563,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   // Generating _tao_QueryInterface method.
   *os << "void *" << node->full_name ()
-      << "::_tao_QueryInterface (ptr_arith_t type)" << be_nl
+      << "::_tao_QueryInterface (ptrdiff_t type)" << be_nl
       << "{" << be_idt_nl
       << "void *retv = 0;" << be_nl << be_nl
       << "if ";
@@ -582,7 +582,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   *os << "(type == ACE_reinterpret_cast ("
       << be_idt << be_idt << be_idt << be_idt << be_idt << be_idt_nl
-      << " ptr_arith_t," << be_nl;
+      << " ptrdiff_t," << be_nl;
 
   if (node->is_abstract ())
     {
@@ -875,7 +875,7 @@ be_visitor_interface_cs::gen_concrete_unchecked_narrow (be_interface *node,
       << node->local_name () << "_ptr," << be_nl
       << "obj->_tao_QueryInterface (" << be_idt << be_idt_nl
       << "ACE_reinterpret_cast (" << be_idt << be_idt_nl
-      << "ptr_arith_t," << be_nl
+      << "ptrdiff_t," << be_nl
       << "&" << node->local_name () << "::_tao_class_id" << be_uidt_nl
       << ")" << be_uidt << be_uidt_nl
       << ")" << be_uidt << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
index c062e2825ce..b0d07a033b0 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
@@ -88,7 +88,7 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
       << node->full_name () << " *," << be_nl
       << "_tao_valuetype" << be_uidt_nl
       << ")," << be_uidt_nl
-      << "(ptr_arith_t) &" << node->full_name () <<"::_downcast" 
+      << "(ptrdiff_t) &" << node->full_name () <<"::_downcast" 
       << be_uidt_nl
       << ");" << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
index bd7cbb13e3f..ebe97e2b476 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -336,10 +336,10 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
     }
 
   // TAO internals.
-  *os << "virtual void *_tao_obv_narrow (ptr_arith_t);"
+  *os << "virtual void *_tao_obv_narrow (ptrdiff_t);"
       << "\n#if defined (_MSC_VER)" << be_nl
       << "virtual void *" << node->flat_name () 
-      << "_tao_obv_narrow (ptr_arith_t);"
+      << "_tao_obv_narrow (ptrdiff_t);"
       << "\n#endif /* _MSC_VER */" << be_nl;
 
   // Support for marshalling.
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index e4c1fbed165..fe109b0c0de 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -145,7 +145,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << "return 0;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "return (" << node->local_name () << " *) "
-      << "v->_tao_obv_narrow ((ptr_arith_t) &_downcast);" << be_uidt_nl
+      << "v->_tao_obv_narrow ((ptrdiff_t) &_downcast);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // The _tao_obv_repository_id method
@@ -161,13 +161,13 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << "void *" << be_nl
       << "#if defined (_MSC_VER)" << be_nl
       << node->name () << "::" << node->flat_name ()
-      << "_tao_obv_narrow (ptr_arith_t type_id)" << be_nl
+      << "_tao_obv_narrow (ptrdiff_t type_id)" << be_nl
       << "#else" << be_nl
       << node->name () << "::"
-      << "_tao_obv_narrow (ptr_arith_t type_id)" << be_nl
+      << "_tao_obv_narrow (ptrdiff_t type_id)" << be_nl
       << "#endif /* _MSC_VER */" << be_nl
       << "{" << be_idt_nl
-      << "if (type_id == (ptr_arith_t) &_downcast)" << be_idt_nl
+      << "if (type_id == (ptrdiff_t) &_downcast)" << be_idt_nl
       << "{" << be_idt_nl
       << "return this;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
@@ -230,7 +230,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   *os << "#if defined (_MSC_VER)" << be_nl
 
       << "void *" << be_nl << node->name ()
-      << "::_tao_obv_narrow (ptr_arith_t type_id)" << be_nl
+      << "::_tao_obv_narrow (ptrdiff_t type_id)" << be_nl
       << "{" << be_idt_nl
       << "return this->" << node->flat_name ()
       << "_tao_obv_narrow (type_id);" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index 6401a0bdff8..2d81b9d9433 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -399,6 +399,10 @@ public:
   void ccmobject (be_interface *val);
   // Accessors for the member.
 
+  idl_bool valuetype_seen (void) const;
+  void valuetype_seen (idl_bool val);
+  // Accessors for the member.
+
 private:
   size_t changing_standard_include_files_;
   // To switch between changing or non-changing standard include
@@ -521,6 +525,9 @@ private:
 
   be_interface *ccmobject_;
   // Reference holder for component skeleton visitors.
+
+  idl_bool valuetype_seen_;
+  // Is there a valuetype in this file?
 };
 
 #endif /* _BE_GLOBAL_H */
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index da0d10a7950..972b014eed8 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -50,6 +50,7 @@ TAO_SRVR_LIBS=-lTAO_PortableServer -lTAO_IORInterceptor -lTAO_ObjRefTemplate \
   -lTAO_Valuetype $(TAO_BASE_LIBS)
 RT_TAO_SRVR_LIBS=-lTAO_RTPortableServer -lTAO_PortableServer $(RT_TAO_BASE_LIBS)
 TAO_CLNT_LIBS= $(TAO_BASE_LIBS)
+TAO_CLNT_VT_LIBS=-lTAO_Valuetype $(TAO_CLNT_LIBS)
 RT_TAO_CLNT_LIBS= $(RT_TAO_BASE_LIBS)
 TAO_DYNAMIC_LIBS=-lTAO_DynamicInterface
 
diff --git a/TAO/tests/OBV/Any/Makefile b/TAO/tests/OBV/Any/Makefile
index dab73125829..69ca19e61a8 100644
--- a/TAO/tests/OBV/Any/Makefile
+++ b/TAO/tests/OBV/Any/Makefile
@@ -22,7 +22,7 @@ CLIENT_OBJS = client.o AnyC.o
 SERVER_OBJS = server.o AnyS_impl.o $(IDL_SRC:.cpp=.o)
 
 # Allow valuetypes
-TAO_IDLFLAGS += -Gv -Ge 1
+TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -45,7 +45,7 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK)
 
 client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK)
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_VT_LIBS) $(POSTLINK)
 
 realclean: clean
 	-$(RM) $(foreach ext, $(IDL_EXT), Any$(ext))
diff --git a/TAO/tests/OBV/Any/client.bor b/TAO/tests/OBV/Any/client.bor
index 3ba0798f001..00ee8f978ad 100644
--- a/TAO/tests/OBV/Any/client.bor
+++ b/TAO/tests/OBV/Any/client.bor
@@ -4,7 +4,7 @@
 
 NAME = client
 
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Gv -Ge 1
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 
 OBJFILES = \
 	$(OBJDIR)\AnyC.obj \
@@ -12,11 +12,13 @@ OBJFILES = \
 
 CFLAGS = \
 	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS)
+	$(TAO_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
-	$(TAO_LIB)
+	$(TAO_LIB) \
+	$(TAO_VALUETYPE_LIB)
 
 IDLFILES = \
         $(IDLDIR)\Any.idl
diff --git a/TAO/tests/OBV/Any/client.dsp b/TAO/tests/OBV/Any/client.dsp
index d162f442166..10748a3c58f 100644
--- a/TAO/tests/OBV/Any/client.dsp
+++ b/TAO/tests/OBV/Any/client.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"

+# ADD LINK32 ace.lib TAO.lib TAO_Valuetype.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "OBV Any Client - Win32 Debug"

 

@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"

+# ADD LINK32 aced.lib TAOd.lib TAO_Valuetyped.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\PortableServer"

 

 !ENDIF 

 

@@ -125,7 +125,7 @@ InputPath=.\Any.idl
 InputName=Any

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -163,7 +163,7 @@ InputPath=.\Any.idl
 InputName=Any

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 # End Custom Build

 

diff --git a/TAO/tests/OBV/Any/server.bor b/TAO/tests/OBV/Any/server.bor
index fc88b968910..2ac66e7af3b 100644
--- a/TAO/tests/OBV/Any/server.bor
+++ b/TAO/tests/OBV/Any/server.bor
@@ -4,7 +4,7 @@
 
 NAME = server
 
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Gv -Ge 1
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 
 OBJFILES = \
 	$(OBJDIR)\AnyC.obj \
@@ -15,12 +15,14 @@ OBJFILES = \
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
-	$(TAO_PORTABLESERVER_CFLAGS)
+	$(TAO_PORTABLESERVER_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_PORTABLESERVER_LIB)
+	$(TAO_PORTABLESERVER_LIB) \
+	$(TAO_VALUETYPE_LIB)
 
 IDLFILES = \
         $(IDLDIR)\Any.idl
diff --git a/TAO/tests/OBV/Any/server.dsp b/TAO/tests/OBV/Any/server.dsp
index bb346cfdc81..bbfd03c4c50 100644
--- a/TAO/tests/OBV/Any/server.dsp
+++ b/TAO/tests/OBV/Any/server.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"

+# ADD LINK32 ace.lib TAO.lib TAO_Valuetype.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "OBV Any Server - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"

+# ADD LINK32 aced.lib TAOd.lib TAO_Valuetyped.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\PortableServer"

 

 !ENDIF 

 

@@ -137,7 +137,7 @@ InputPath=.\Any.idl
 InputName=Any

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -175,7 +175,7 @@ InputPath=.\Any.idl
 InputName=Any

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/OBV/Factory/Makefile b/TAO/tests/OBV/Factory/Makefile
index 2ba2ae40aab..6b83f8f26fb 100644
--- a/TAO/tests/OBV/Factory/Makefile
+++ b/TAO/tests/OBV/Factory/Makefile
@@ -21,8 +21,7 @@ SRC = $(addsuffix .cpp, $(BIN) FactoryC_impl FactoryS_impl) $(IDL_SRC)
 CLIENT_OBJS = client.o FactoryC.o FactoryC_impl.o
 SERVER_OBJS = server.o FactoryC_impl.o FactoryS_impl.o $(IDL_SRC:.cpp=.o)
 
-# Allow valuetypes
-TAO_IDLFLAGS += -Gv -Ge 1
+TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -45,7 +44,7 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK)
 
 client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK)
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_VT_LIBS) $(POSTLINK)
 
 realclean: clean
 	-$(RM) $(foreach ext, $(IDL_EXT), Factory$(ext))
diff --git a/TAO/tests/OBV/Factory/client.bor b/TAO/tests/OBV/Factory/client.bor
index acaca38e75d..97d8b88cc1f 100644
--- a/TAO/tests/OBV/Factory/client.bor
+++ b/TAO/tests/OBV/Factory/client.bor
@@ -4,7 +4,7 @@
 
 NAME = client
 
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Gv -Ge 1
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 
 OBJFILES = \
 	$(OBJDIR)\FactoryC.obj \
@@ -13,11 +13,13 @@ OBJFILES = \
 
 CFLAGS = \
 	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS)
+	$(TAO_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
-	$(TAO_LIB)
+	$(TAO_LIB) \
+	$(TAO_VALUETYPE_LIB)
 
 IDLFILES = \
         $(IDLDIR)\Factory.idl
diff --git a/TAO/tests/OBV/Factory/client.dsp b/TAO/tests/OBV/Factory/client.dsp
index 0aad3130622..8c02d6f1d38 100644
--- a/TAO/tests/OBV/Factory/client.dsp
+++ b/TAO/tests/OBV/Factory/client.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao"

+# ADD LINK32 TAO_Valuetype.lib tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\Valuetype"

 

 !ELSEIF  "$(CFG)" == "Factory Client - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao"

+# ADD LINK32 TAO_Valuetyped.lib taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\Valuetype"

 

 !ENDIF 

 

@@ -129,7 +129,7 @@ InputPath=.\Factory.idl
 InputName=Factory

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -167,7 +167,7 @@ InputPath=.\Factory.idl
 InputName=Factory

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/OBV/Factory/server.bor b/TAO/tests/OBV/Factory/server.bor
index c5c84b0d3c5..6de5623e792 100644
--- a/TAO/tests/OBV/Factory/server.bor
+++ b/TAO/tests/OBV/Factory/server.bor
@@ -4,7 +4,7 @@
 
 NAME = server
 
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Gv -Ge 1
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 
 OBJFILES = \
 	$(OBJDIR)\FactoryC.obj \
@@ -16,12 +16,14 @@ OBJFILES = \
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
-	$(TAO_PORTABLESERVER_CFLAGS)
+	$(TAO_PORTABLESERVER_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_PORTABLESERVER_LIB)
+	$(TAO_PORTABLESERVER_LIB) \
+	$(TAO_VALUETYPE_LIB)
 
 IDLFILES = \
         $(IDLDIR)\Factory.idl
diff --git a/TAO/tests/OBV/Factory/server.dsp b/TAO/tests/OBV/Factory/server.dsp
index 850e9146b85..79d34d467c9 100644
--- a/TAO/tests/OBV/Factory/server.dsp
+++ b/TAO/tests/OBV/Factory/server.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Valuetype.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\Valuetype"

 

 !ELSEIF  "$(CFG)" == "Factory Server - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"

+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Valuetyped.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\Valuetype"

 

 !ENDIF 

 

@@ -137,7 +137,7 @@ InputPath=.\Factory.idl
 InputName=Factory

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -175,7 +175,7 @@ InputPath=.\Factory.idl
 InputName=Factory

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/OBV/Forward/Makefile b/TAO/tests/OBV/Forward/Makefile
index 588370749b9..83d37bf10fd 100644
--- a/TAO/tests/OBV/Forward/Makefile
+++ b/TAO/tests/OBV/Forward/Makefile
@@ -24,8 +24,7 @@ SRC = $(addsuffix .cpp, $(BIN) Test_impl) $(IDL_SRC)
 CLIENT_OBJS = TreeBaseC.o TreeControllerC.o TreeNodeC.o client.o
 SERVER_OBJS = $(IDL_SRC:.cpp=.o) Test_impl.o server.o
 
-# Allow valuetypes
-TAO_IDLFLAGS += -Gv -Ge 1
+TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -49,7 +48,7 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK)
 
 client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK)
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_VT_LIBS) $(POSTLINK)
 
 realclean: clean
 	-$(RM) $(foreach ext, $(IDL_EXT), TreeBase$(ext) \
diff --git a/TAO/tests/OBV/Forward/client.bor b/TAO/tests/OBV/Forward/client.bor
index dc58bdb5199..bbd6450b569 100644
--- a/TAO/tests/OBV/Forward/client.bor
+++ b/TAO/tests/OBV/Forward/client.bor
@@ -4,7 +4,7 @@
 
 NAME = client
 
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Gv -Ge 1
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 
 OBJFILES = \
 	$(OBJDIR)\TreeBaseC.obj \
@@ -14,11 +14,13 @@ OBJFILES = \
 
 CFLAGS = \
 	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS)
+	$(TAO_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
-	$(TAO_LIB)
+	$(TAO_LIB) \
+	$(TAO_VALUETYPE_LIB)
 
 IDLFILES = \
         $(IDLDIR)\TreeBase.idl \
diff --git a/TAO/tests/OBV/Forward/client.dsp b/TAO/tests/OBV/Forward/client.dsp
index c5bf897ff7b..3aacddac7e4 100644
--- a/TAO/tests/OBV/Forward/client.dsp
+++ b/TAO/tests/OBV/Forward/client.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao"

+# ADD LINK32 TAO_Valuetype.lib tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\Valuetype"

 

 !ELSEIF  "$(CFG)" == "Forward Client - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao"

+# ADD LINK32 TAO_Valuetyped.lib taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\Valuetype"

 

 !ENDIF 

 

@@ -139,7 +139,7 @@ InputPath=.\TreeBase.idl
 InputName=TreeBase

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -177,7 +177,7 @@ InputPath=.\TreeBase.idl
 InputName=TreeBase

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -223,7 +223,7 @@ InputPath=.\TreeController.idl
 InputName=TreeController

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -261,7 +261,7 @@ InputPath=.\TreeController.idl
 InputName=TreeController

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -307,7 +307,7 @@ InputPath=.\TreeNode.idl
 InputName=TreeNode

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -345,7 +345,7 @@ InputPath=.\TreeNode.idl
 InputName=TreeNode

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/OBV/Forward/server.bor b/TAO/tests/OBV/Forward/server.bor
index 4882de3fdf9..82d5bf13b67 100644
--- a/TAO/tests/OBV/Forward/server.bor
+++ b/TAO/tests/OBV/Forward/server.bor
@@ -4,7 +4,7 @@
 
 NAME = server
 
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Gv -Ge 1
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 
 OBJFILES = \
 	$(OBJDIR)\TreeBaseC.obj \
@@ -19,12 +19,14 @@ OBJFILES = \
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
-	$(TAO_PORTABLESERVER_CFLAGS)
+	$(TAO_PORTABLESERVER_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_PORTABLESERVER_LIB)
+	$(TAO_PORTABLESERVER_LIB) \
+	$(TAO_VALUETYPE_LIB)
 
 IDLFILES = \
         $(IDLDIR)\TreeBase.idl \
diff --git a/TAO/tests/OBV/Forward/server.dsp b/TAO/tests/OBV/Forward/server.dsp
index 7fc21bdaeba..4deec9e8f7d 100644
--- a/TAO/tests/OBV/Forward/server.dsp
+++ b/TAO/tests/OBV/Forward/server.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Valuetype.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\Valuetype"

 

 !ELSEIF  "$(CFG)" == "Forward Server - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"

+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Valuetyped.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\Valuetype"

 

 !ENDIF 

 

@@ -169,7 +169,7 @@ InputPath=.\TreeBase.idl
 InputName=TreeBase

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -208,7 +208,7 @@ InputPath=.\TreeBase.idl
 InputName=TreeBase

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -252,7 +252,7 @@ InputPath=.\TreeController.idl
 InputName=TreeController

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "f$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -291,7 +291,7 @@ InputPath=.\TreeController.idl
 InputName=TreeController

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -335,7 +335,7 @@ InputPath=.\TreeNode.idl
 InputName=TreeNode

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -374,7 +374,7 @@ InputPath=.\TreeNode.idl
 InputName=TreeNode

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/OBV/TC_Alignment/Makefile b/TAO/tests/OBV/TC_Alignment/Makefile
index 7d183e76542..cf8188694a5 100644
--- a/TAO/tests/OBV/TC_Alignment/Makefile
+++ b/TAO/tests/OBV/TC_Alignment/Makefile
@@ -45,7 +45,7 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK)
 
 client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK)
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_VT_LIBS) $(POSTLINK)
 
 realclean: clean
 	-$(RM) $(foreach ext, $(IDL_EXT) , test$(ext))
diff --git a/TAO/tests/OBV/TC_Alignment/client.bor b/TAO/tests/OBV/TC_Alignment/client.bor
index 5b207f5444c..f9c4133db87 100644
--- a/TAO/tests/OBV/TC_Alignment/client.bor
+++ b/TAO/tests/OBV/TC_Alignment/client.bor
@@ -12,11 +12,13 @@ OBJFILES = \
 
 CFLAGS = \
 	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS)
+	$(TAO_CFLAGS) \
+	$(TAOVALUETYPE_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
-	$(TAO_LIB)
+	$(TAO_LIB) \
+	$(TAO_VALUETYPE_LIB)
 
 IDLFILES = \
         $(IDLDIR)\test.idl
diff --git a/TAO/tests/OBV/TC_Alignment/client.dsp b/TAO/tests/OBV/TC_Alignment/client.dsp
index e988cca4b66..4bceacce936 100644
--- a/TAO/tests/OBV/TC_Alignment/client.dsp
+++ b/TAO/tests/OBV/TC_Alignment/client.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../tao" /libpath:"../../../../ace"

+# ADD LINK32 TAO_Valuetype.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../tao/Valuetype" /libpath:"../../../tao" /libpath:"../../../../ace"

 

 !ELSEIF  "$(CFG)" == "OBV TC Alignment Client - Win32 Debug"

 

@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../tao" /libpath:"../../../../ace"

+# ADD LINK32 TAO_Valuetyped.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../tao/Valuetype" /libpath:"../../../tao" /libpath:"../../../../ace"

 

 !ENDIF 

 

diff --git a/TAO/tests/OBV/TC_Alignment/server.bor b/TAO/tests/OBV/TC_Alignment/server.bor
index 282c6d6dee0..47a693fdef6 100644
--- a/TAO/tests/OBV/TC_Alignment/server.bor
+++ b/TAO/tests/OBV/TC_Alignment/server.bor
@@ -15,12 +15,14 @@ OBJFILES = \
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
-	$(TAO_PORTABLESERVER_CFLAGS)
+	$(TAO_PORTABLESERVER_CFLAGS) \
+	$(TAO_VALUETYPE_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_PORTABLESERVER_LIB)
+	$(TAO_PORTABLESERVER_LIB) \
+	$(TAO_VALUETYPE_LIB)
 
 IDLFILES = \
         $(IDLDIR)\test.idl
diff --git a/TAO/tests/OBV/TC_Alignment/server.dsp b/TAO/tests/OBV/TC_Alignment/server.dsp
index 3c60780d415..a70e50d5e47 100644
--- a/TAO/tests/OBV/TC_Alignment/server.dsp
+++ b/TAO/tests/OBV/TC_Alignment/server.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../tao/PortableServer" /libpath:"../../../tao" /libpath:"../../../../ace"

+# ADD LINK32 TAO_Valuetype.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../tao/Valuetype" /libpath:"../../../tao/PortableServer" /libpath:"../../../tao" /libpath:"../../../../ace"

 

 !ELSEIF  "$(CFG)" == "OBV TC Alignment Server - Win32 Debug"

 

@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../tao/PortableServer" /libpath:"../../../tao" /libpath:"../../../../ace"

+# ADD LINK32 TAO_Valuetyped.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../tao/Valuetype" /libpath:"../../../tao/PortableServer" /libpath:"../../../tao" /libpath:"../../../../ace"

 

 !ENDIF