ChangeLogTag: Fri Jun 17 15:40:51 2005 J.T. Conklin <jtc@acorntoolworks.com>

3 files changed, 11 insertions, 73 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 453d597cac1..29e0afde745 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,14 +1,22 @@
+Fri Jun 17 15:40:51 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* orbsvcs/orbsvcs/orbsvcs.rc:
+	* orbsvcs/orbsvcs/orbsvcs_export.h:
+
+	  Remove stray bits left over from when orbsvcs was a single
+	  library.
+
 Fri Jun 17 19:09:56 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_codegen.cpp:
-        
+
           Reverted the change of
-          
+
           Thu Jun 16 18:54:01 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
           It seems this problem is appearing in other places besides
           generated code, and that making lots of modifications to
-          TAO code to work around what is essentially an HP compiler 
+          TAO code to work around what is essentially an HP compiler
           bug is not the right approach. Thanks to Johnny Willemsen
           <jwillemsen@remedy.nl> for advice on this matter.
 
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.rc b/TAO/orbsvcs/orbsvcs/orbsvcs.rc
deleted file mode 100644
index 9dcfda5d6d4..00000000000
--- a/TAO/orbsvcs/orbsvcs/orbsvcs.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "..\..\tao\Version.h"
-
-1 VERSIONINFO
- FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "FileDescription", "ORBSVCS\0"
-            VALUE "FileVersion", TAO_VERSION "\0"
-            VALUE "InternalName", "ORBSVCSDLL\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "ORBSVCS.DLL\0"
-            VALUE "ProductName", "ORBSVCS\0"
-            VALUE "ProductVersion", TAO_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_export.h b/TAO/orbsvcs/orbsvcs/orbsvcs_export.h
deleted file mode 100644
index 7a399dbc2bd..00000000000
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_ORBSVCS_EXPORT_H
-#define TAO_ORBSVCS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_ORBSVCS_HAS_DLL)
-#    define TAO_ORBSVCS_HAS_DLL 0
-#  endif /* ! TAO_ORBSVCS_HAS_DLL */
-#else
-#  if !defined (TAO_ORBSVCS_HAS_DLL)
-#    define TAO_ORBSVCS_HAS_DLL 1
-#  endif /* ! TAO_ORBSVCS_HAS_DLL */
-#endif
-
-#if defined (TAO_ORBSVCS_HAS_DLL) && (TAO_ORBSVCS_HAS_DLL == 1)
-#  if defined (TAO_ORBSVCS_BUILD_DLL)
-#    define TAO_ORBSVCS_Export ACE_Proper_Export_Flag
-#    define TAO_ORBSVCS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_ORBSVCS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_ORBSVCS_BUILD_DLL */
-#    define TAO_ORBSVCS_Export ACE_Proper_Import_Flag
-#    define TAO_ORBSVCS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_ORBSVCS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_ORBSVCS_BUILD_DLL */
-#else /* TAO_ORBSVCS_HAS_DLL == 1 */
-#  define TAO_ORBSVCS_Export
-#  define TAO_ORBSVCS_SINGLETON_DECLARATION(T)
-#  define TAO_ORBSVCS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_ORBSVCS_HAS_DLL == 1 */
-
-#endif /* TAO_ORBSVCS_EXPORT_H */
-
-// End of auto generated file.