ChangeLogTag:Fri Jan 09 21:37:39 1998 <coryan@MILONGA>

11 files changed, 62 insertions, 18 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 7a44ec89ba7..8dd354736bf 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,21 @@
+Fri Jan 09 21:37:39 1998    <coryan@MILONGA>
+
+	* TAO_IDL/be/be_typedef.cpp: 
+	  Added missing accept() method for visitors.
+
+	* orbsvcs/orbsvcs/Runtime_Scheduler.cpp: 
+	  Fixed signed/unsigned warning.
+
+	* orbsvcs/Naming_Service/CosNaming_i.cpp: 
+	  Yet another fix for the namespace warnings.
+
+	* orbsvcs/Dump_Schedule/Dump_Schedule.dsp: 
+	* orbsvcs/Event_Service/Event_Service.dsp: 
+	* orbsvcs/Naming_Service/Naming_Service.dsp: 
+	* orbsvcs/Scheduling_Service/Scheduling_Service.dsp: 
+	* orbsvcs/tests/Event_Latency/Event_Latency.dsp: 
+	  Executables are not generated into the Debug subdirectory.
+	
 Fri Jan  9 20:49:41 1998  Sergio Flores  <sergio@polka.cs.wustl.edu>
 
 	* orbsvcs/Naming_Service/CosNaming_i.cpp: Fixed some code dealing
diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp
index 43640de7ce3..968da2c0157 100644
--- a/TAO/TAO_IDL/be/be_typedef.cpp
+++ b/TAO/TAO_IDL/be/be_typedef.cpp
@@ -318,6 +318,12 @@ be_typedef::compute_size_type (void)
   return 0;
 }
 
+int
+be_typedef::accept (be_visitor *visitor)
+{
+  return visitor->visit_typedef (this);
+}
+
 // Narrowing
 IMPL_NARROW_METHODS2 (be_typedef, AST_Typedef, be_type)
 IMPL_NARROW_FROM_DECL (be_typedef)
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index fbe2dffab13..d3914d16167 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -310,6 +310,12 @@ public:
   static const char *be_get_server_skeleton (String *idl_file_name);
   static const char *be_get_server_inline (String *idl_file_name);
 
+  virtual String *export_macro (void) const;
+  // returns the macro name for exporting classes in Win32 DLL.
+
+  virtual void export_macro (String *macro_name);
+  // set the macro name for export classes in Win32 DLL.
+
 private:
   // Data
   UTL_ScopeStack		*pd_scopes;		// Store scopes stack
@@ -344,6 +350,8 @@ private:
 							// Seen this include
 							// before?
   String                        *pd_idl_src_file;       // IDL source file
+
+  String *export_macro_;
 };
 
 #endif	//_IDL_IDL_GLOBAL_HH
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 6f222261322..d339bff2a49 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -95,7 +95,9 @@ IDL_GlobalData::IDL_GlobalData()
       pd_include_file_names(NULL),
       pd_n_include_file_names(0),
       pd_n_alloced_file_names(0),
-      pd_parse_state(PS_NoState)
+      pd_parse_state(PS_NoState),
+      pd_idl_src_file (0),
+      export_macro_ (0)
 {
   // empty
 }
@@ -575,3 +577,13 @@ IDL_GlobalData::be_get_server_inline_fname ()
   return be_get_server_inline (idl_global->idl_src_file ());
 }
 
+String *IDL_GlobalData::export_macro (void) const
+{
+  return this->export_macro_;
+}
+
+void IDL_GlobalData::export_macro (String *s)
+{
+  this->export_macro_ = s;
+}
+
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsp
index 1b18702b6ed..7ce62c41a6c 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsp
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsp
@@ -61,7 +61,7 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

diff --git a/TAO/orbsvcs/Event_Service/Event_Service.dsp b/TAO/orbsvcs/Event_Service/Event_Service.dsp
index bf0200aab49..2fcf8139907 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.dsp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.dsp
@@ -61,7 +61,7 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

diff --git a/TAO/orbsvcs/Naming_Service/CosNaming_i.cpp b/TAO/orbsvcs/Naming_Service/CosNaming_i.cpp
index a2f20a33101..de639b4e514 100644
--- a/TAO/orbsvcs/Naming_Service/CosNaming_i.cpp
+++ b/TAO/orbsvcs/Naming_Service/CosNaming_i.cpp
@@ -99,7 +99,7 @@ NS_NamingContext::bind (const CosNaming::Name& n,
   if (len == 0) 
     {
       IT_env.clear ();
-      IT_env.exception (new POA_CosNaming::NamingContext::InvalidName);
+      IT_env.exception (new CosNaming::NamingContext::InvalidName);
       return;
     }
 
@@ -125,7 +125,7 @@ NS_NamingContext::bind (const CosNaming::Name& n,
       if (context_.bind (name, entry) == -1)
 	{
 	  IT_env.clear ();
-	  IT_env.exception (new POA_CosNaming::NamingContext::AlreadyBound);
+	  IT_env.exception (new CosNaming::NamingContext::AlreadyBound);
 	  return;
 	}
         /**///	throw CosNaming::NamingContext::AlreadyBound ();
@@ -188,7 +188,7 @@ NS_NamingContext::bind_context (const CosNaming::Name &n,
   if (len == 0)
     {
       IT_env.clear ();
-      IT_env.exception (new POA_CosNaming::NamingContext::InvalidName);
+      IT_env.exception (new CosNaming::NamingContext::InvalidName);
       return;
     }
 
@@ -215,7 +215,7 @@ NS_NamingContext::bind_context (const CosNaming::Name &n,
       if (context_.bind (name, entry) == 1)
 	{
 	  IT_env.clear ();
-	  IT_env.exception (new POA_CosNaming::NamingContext::AlreadyBound);
+	  IT_env.exception (new CosNaming::NamingContext::AlreadyBound);
 	  return;
 	}
 
@@ -235,7 +235,7 @@ NS_NamingContext::rebind_context (const CosNaming::Name &n,
   if (len == 0)
     {
       IT_env.clear ();
-      IT_env.exception (new POA_CosNaming::NamingContext::InvalidName);
+      IT_env.exception (new CosNaming::NamingContext::InvalidName);
       return;
     }
 
@@ -277,7 +277,7 @@ NS_NamingContext::resolve (const CosNaming::Name& n,
   if (len == 0)
     {
       IT_env.clear ();
-      IT_env.exception (new POA_CosNaming::NamingContext::InvalidName);
+      IT_env.exception (new CosNaming::NamingContext::InvalidName);
       return 0;
     }
   
@@ -287,7 +287,7 @@ NS_NamingContext::resolve (const CosNaming::Name& n,
   if (context_.find (name, entry) == -1) 
     {
       IT_env.clear ();
-      IT_env.exception (new POA_CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_object, n));
+      IT_env.exception (new CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_object, n));
       return 0;
     }
   
@@ -340,7 +340,7 @@ NS_NamingContext::unbind (const CosNaming::Name& n,
   if (len == 0)
     {
       IT_env.clear ();
-      IT_env.exception (new POA_CosNaming::NamingContext::InvalidName);
+      IT_env.exception (new CosNaming::NamingContext::InvalidName);
       return;
     }
 
@@ -364,7 +364,7 @@ NS_NamingContext::unbind (const CosNaming::Name& n,
       if (context_.unbind (name) == -1)
 	{
 	  IT_env.clear ();
-	  IT_env.exception (new POA_CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_object, n));
+	  IT_env.exception (new CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_object, n));
 	  return;
 	}
     }
@@ -393,7 +393,7 @@ NS_NamingContext::bind_new_context (const CosNaming::Name& n,
   if (IT_env.exception () != 0)
     {
       CORBA::release (c);
-      return POA_CosNaming::NamingContext::_nil ();
+      return CosNaming::NamingContext::_nil ();
     }
   
   return NS_NamingContext::_duplicate (c);
@@ -405,7 +405,7 @@ NS_NamingContext::destroy (CORBA::Environment &IT_env)
   if (context_.current_size () != 0)
     {
       IT_env.clear ();
-      IT_env.exception (new POA_CosNaming::NamingContext::NotEmpty);
+      IT_env.exception (new CosNaming::NamingContext::NotEmpty);
       return;
     }
 
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
index 85015f994a2..935870e8256 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
@@ -61,7 +61,7 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsp
index b89514b9686..3fb9b8c7dd4 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsp
@@ -62,7 +62,7 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 1f45181d12a..ffe3639d3d9 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -144,7 +144,7 @@ void ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle,
     }
   // Just check that the information is consistent.
   RtecScheduler::Dependency_Set& deps = rt_info_[handle]->dependencies;
-  for (int i = 0; i < deps.length (); ++i)
+  for (CORBA::ULong i = 0; i < deps.length (); ++i)
     {
       if (deps[i].rt_info == dependency
 	  && deps[i].number_of_calls == number_of_calls)
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp
index 4ec8c6d72bf..08635e15e6a 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp
@@ -61,7 +61,7 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c