17 files changed, 24 insertions, 75 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c7d3aa3d4e9..594ae41ef52 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Wed Aug 23 12:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IIOP_Factory.{h,cpp}:
+        * tao/IIOP_Lite_Factory.{h,cpp}:
+        * tao/Strategies/DIOP_Factory.{h,cpp}:
+        * tao/Strategies/SCIOP_Factory.{h,cpp}:
+        * tao/Strategies/SCIOP_Lite_Factory.{h,cpp}:
+        * tao/Strategies/SHMIOP_Factory.{h,cpp}:
+        * tao/Strategies/UIOP_Factory.{h,cpp}:
+        * tao/Strategies/UIOP_Lite_Factory.{h,cpp}:
+          Removed the minor_ and major_ members, they where only initialized
+          to a value and then never used at all. Saves a few bytes of footprint
+
 Tue Aug 22 20:28:26 UTC 2006  Yan Dai  <dai_y@ociweb.com>
 
         * tao\PortableServer\DII_Arguments_Converter.cpp:
@@ -7,11 +20,11 @@ Tue Aug 22 20:28:26 UTC 2006  Yan Dai  <dai_y@ociweb.com>
 
           Made the TAO_DII_Arguments_Converter service object registered
           when PortableServer lib is loaded and the TAO_DII_Arguments_Converter_Impl
-          object will overwrite the registered "DII_Arguments_Converter" service 
-          object. This would fix dynamic_cast failure when accessing the 
+          object will overwrite the registered "DII_Arguments_Converter" service
+          object. This would fix dynamic_cast failure when accessing the
           "DII_Arguments_Converter" dynamic service object in Upcall_Wrapper::upcall()
-          on FC4 with gcc4.x builds. This should fix the 
-          $TAO_ROOT/tests/DII_Collocation_Tests/oneway test failure on FC4 with 
+          on FC4 with gcc4.x builds. This should fix the
+          $TAO_ROOT/tests/DII_Collocation_Tests/oneway test failure on FC4 with
           gcc4.x builds.
 
 Tue Aug 22 19:39:07 UTC 2006  Ciju John  <john@ociweb.com>
diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp
index 3ba32da5e0a..48d0c9e256c 100644
--- a/TAO/tao/IIOP_Factory.cpp
+++ b/TAO/tao/IIOP_Factory.cpp
@@ -17,9 +17,7 @@ static const char the_prefix[] = "iiop";
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IIOP_Protocol_Factory::TAO_IIOP_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP),
-     major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
+  :  TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP)
 {
 }
 
diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h
index 01acb9ea572..46051c422cd 100644
--- a/TAO/tao/IIOP_Factory.h
+++ b/TAO/tao/IIOP_Factory.h
@@ -56,12 +56,6 @@ public:
   virtual TAO_Acceptor  *make_acceptor (void);
   virtual TAO_Connector *make_connector  (void);
   virtual int requires_explicit_endpoint (void) const;
-
-private:
-  /// Changing the version number can be used to provide backwards
-  /// compatibility with old clients.
-  int const major_;
-  int const minor_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Lite_Factory.cpp b/TAO/tao/IIOP_Lite_Factory.cpp
index 57ddb594910..9056fbf34e8 100644
--- a/TAO/tao/IIOP_Lite_Factory.cpp
+++ b/TAO/tao/IIOP_Lite_Factory.cpp
@@ -17,9 +17,7 @@ static const char the_prefix[] = "iiop";
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IIOP_Lite_Protocol_Factory::TAO_IIOP_Lite_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP),
-     major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
+  :  TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP)
 {
 }
 
diff --git a/TAO/tao/IIOP_Lite_Factory.h b/TAO/tao/IIOP_Lite_Factory.h
index 2b0141b4d55..5bf56335b77 100644
--- a/TAO/tao/IIOP_Lite_Factory.h
+++ b/TAO/tao/IIOP_Lite_Factory.h
@@ -58,12 +58,6 @@ public:
   virtual TAO_Acceptor  *make_acceptor (void);
   virtual TAO_Connector *make_connector  (void);
   virtual int requires_explicit_endpoint (void) const;
-
-private:
-  /// Changing the version number can be used to provide backwards
-  /// compatibility with old clients.
-  int const major_;
-  int const minor_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp
index 8c23791d31f..36e23bf0427 100644
--- a/TAO/tao/Strategies/DIOP_Factory.cpp
+++ b/TAO/tao/Strategies/DIOP_Factory.cpp
@@ -20,9 +20,7 @@ static const char the_prefix[] = "diop";
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (TAO_TAG_DIOP_PROFILE),
-     major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
+  :  TAO_Protocol_Factory (TAO_TAG_DIOP_PROFILE)
 {
 }
 
diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h
index 011900bb655..9085f37f7fb 100644
--- a/TAO/tao/Strategies/DIOP_Factory.h
+++ b/TAO/tao/Strategies/DIOP_Factory.h
@@ -67,12 +67,6 @@ public:
   virtual TAO_Connector *make_connector  (void);
   virtual int requires_explicit_endpoint (void) const;
   //@}
-
-private:
-  /// Changing the version number can be used to provide backwards
-  /// compatibility with old clients.
-  int major_;
-  int minor_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp
index c6c0d3a271d..8734e78cdbc 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Factory.cpp
@@ -16,9 +16,7 @@ static const char prefix_[] = "sciop";
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SCIOP_Protocol_Factory::TAO_SCIOP_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE),
-     major_ (TAO_DEF_SCIOP_MAJOR),
-     minor_ (TAO_DEF_SCIOP_MINOR)
+  :  TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE)
 {
 }
 
diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h
index d0b1fc489fa..6bf649a1825 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.h
+++ b/TAO/tao/Strategies/SCIOP_Factory.h
@@ -57,12 +57,6 @@ public:
   virtual TAO_Acceptor  *make_acceptor (void);
   virtual TAO_Connector *make_connector  (void);
   virtual int requires_explicit_endpoint (void) const;
-
-private:
-  /// Changing the version number can be used to provide backwards
-  /// compatibility with old clients.
-  int major_;
-  int minor_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp
index e71cb4dd6ce..451be1d5f1a 100644
--- a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp
@@ -14,9 +14,7 @@ static const char prefix_[] = "sciop";
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SCIOP_Lite_Protocol_Factory::TAO_SCIOP_Lite_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE),
-     major_ (TAO_DEF_SCIOP_MAJOR),
-     minor_ (TAO_DEF_SCIOP_MINOR)
+  :  TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE)
 {
 }
 
diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.h b/TAO/tao/Strategies/SCIOP_Lite_Factory.h
index 7c9dbd4d181..2c5ee683006 100644
--- a/TAO/tao/Strategies/SCIOP_Lite_Factory.h
+++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.h
@@ -58,12 +58,6 @@ public:
   virtual TAO_Acceptor  *make_acceptor (void);
   virtual TAO_Connector *make_connector  (void);
   virtual int requires_explicit_endpoint (void) const;
-
-private:
-  /// Changing the version number can be used to provide backwards
-  /// compatibility with old clients.
-  int major_;
-  int minor_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp
index 27cca45b226..c7b0a4d24fc 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp
@@ -23,8 +23,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SHMIOP_Protocol_Factory::TAO_SHMIOP_Protocol_Factory (void)
   : TAO_Protocol_Factory (TAO_TAG_SHMEM_PROFILE),
-    major_ (TAO_DEF_GIOP_MAJOR),
-    minor_ (TAO_DEF_GIOP_MINOR),
     mmap_prefix_ (0),
     min_bytes_ (10*1024)        // @@ Nanbor, remove this magic number!!
 {
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.h b/TAO/tao/Strategies/SHMIOP_Factory.h
index 0b623455790..382282475b6 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.h
+++ b/TAO/tao/Strategies/SHMIOP_Factory.h
@@ -75,11 +75,6 @@ public:
   const ACE_TCHAR *mmap_file_prefix (void);
 
 private:
-  int major_;
-  int minor_;
-  // Changing the version number can be used to provide backwards
-  // compatibility with old clients.
-
   /// Specify the prefix (full path) for mmap files
   ACE_TCHAR *mmap_prefix_;
 
diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp
index b74a464f82c..91eefcecd09 100644
--- a/TAO/tao/Strategies/UIOP_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Factory.cpp
@@ -23,9 +23,7 @@ static const char prefix_[] = "uiop";
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIOP_Protocol_Factory::TAO_UIOP_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE),
-     major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
+  :  TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE)
 {
 }
 
diff --git a/TAO/tao/Strategies/UIOP_Factory.h b/TAO/tao/Strategies/UIOP_Factory.h
index d3ec7616987..c19afd3c666 100644
--- a/TAO/tao/Strategies/UIOP_Factory.h
+++ b/TAO/tao/Strategies/UIOP_Factory.h
@@ -70,12 +70,6 @@ public:
   virtual TAO_Connector *make_connector  (void);
   virtual int requires_explicit_endpoint (void) const;
   //@}
-
-private:
-  int major_;
-  int minor_;
-  // Changing the version number can be used to provide backwards
-  // compatibility with old clients.
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
index 8aa707a3472..d314968e62d 100644
--- a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
@@ -21,9 +21,7 @@ static const char prefix_[] = "uiop";
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIOP_Lite_Protocol_Factory::TAO_UIOP_Lite_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE),
-     major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
+  :  TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE)
 {
 }
 
diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.h b/TAO/tao/Strategies/UIOP_Lite_Factory.h
index 98e127d58f7..2941d5ee45c 100644
--- a/TAO/tao/Strategies/UIOP_Lite_Factory.h
+++ b/TAO/tao/Strategies/UIOP_Lite_Factory.h
@@ -71,13 +71,6 @@ public:
   virtual TAO_Connector *make_connector  (void);
   virtual int requires_explicit_endpoint (void) const;
   //@}
-
-private:
-  int major_;
-  int minor_;
-  // Changing the version number can be used to provide backwards
-  // compatibility with old clients.
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL