*** empty log message ***

1 files changed, 39 insertions, 39 deletions

diff --git a/TAO/tao/POA.i b/TAO/tao/POA.i
index db250f60c94..ef7cfca1854 100644
--- a/TAO/tao/POA.i
+++ b/TAO/tao/POA.i
@@ -87,6 +87,16 @@ TAO_POA_Policies::request_processing (PortableServer::RequestProcessingPolicyVal
   this->request_processing_ = value;
 }
 
+ACE_INLINE int
+TAO_Creation_Time::creation_time_length (void)
+{
+#if defined (POA_NO_TIMESTAMP)
+  return 0;
+#else
+  return TAO_Creation_Time::max_space_required_for_two_ulong_to_hex;
+#endif /* POA_NO_TIMESTAMP */
+}
+
 ACE_INLINE 
 TAO_Creation_Time::TAO_Creation_Time (const ACE_Time_Value &creation_time)
 {
@@ -120,35 +130,49 @@ TAO_Creation_Time::creation_time (void) const
 }
 
 ACE_INLINE int
-TAO_Creation_Time::creation_time_length (void)
+TAO_Creation_Time::operator== (const TAO_Creation_Time &rhs) const
+{
+#if defined (POA_NO_TIMESTAMP)
+  return 1;
+#else
+  return ACE_OS::memcmp (this->time_stamp_,
+                         rhs.time_stamp_,
+                         TAO_Creation_Time::creation_time_length ()) == 0;
+#endif /* POA_NO_TIMESTAMP */
+}
+
+ACE_INLINE int
+TAO_Creation_Time::operator!= (const TAO_Creation_Time &rhs) const
 {
 #if defined (POA_NO_TIMESTAMP)
   return 0;
 #else
-  return TAO_Creation_Time::max_space_required_for_two_ulong_to_hex;
+  return ACE_OS::memcmp (this->time_stamp_,
+                         rhs.time_stamp_,
+                         TAO_Creation_Time::creation_time_length ()) != 0;
 #endif /* POA_NO_TIMESTAMP */
 }
 
 ACE_INLINE int
-TAO_Creation_Time::operator== (const TAO_Creation_Time &rhs) const
+TAO_Temporary_Creation_Time::operator== (const TAO_Creation_Time &rhs) const
 {
 #if defined (POA_NO_TIMESTAMP)
   return 1;
 #else
   return ACE_OS::memcmp (this->time_stamp_,
-                         rhs.time_stamp_,
+                         rhs.creation_time (),
                          TAO_Creation_Time::creation_time_length ()) == 0;
 #endif /* POA_NO_TIMESTAMP */
 }
 
 ACE_INLINE int
-TAO_Creation_Time::operator!= (const TAO_Creation_Time &rhs) const
+TAO_Temporary_Creation_Time::operator!= (const TAO_Creation_Time &rhs) const
 {
 #if defined (POA_NO_TIMESTAMP)
   return 0;
 #else
   return ACE_OS::memcmp (this->time_stamp_,
-                         rhs.time_stamp_,
+                         rhs.creation_time (),
                          TAO_Creation_Time::creation_time_length ()) != 0;
 #endif /* POA_NO_TIMESTAMP */
 }
@@ -177,30 +201,6 @@ TAO_Temporary_Creation_Time::creation_time (const void *creation_time)
   this->time_stamp_ = (void *) creation_time;
 }
 
-ACE_INLINE int
-TAO_Temporary_Creation_Time::operator== (const TAO_Creation_Time &rhs) const
-{
-#if defined (POA_NO_TIMESTAMP)
-  return 1;
-#else
-  return ACE_OS::memcmp (this->time_stamp_,
-                         rhs.creation_time (),
-                         TAO_Creation_Time::creation_time_length ()) == 0;
-#endif /* POA_NO_TIMESTAMP */
-}
-
-ACE_INLINE int
-TAO_Temporary_Creation_Time::operator!= (const TAO_Creation_Time &rhs) const
-{
-#if defined (POA_NO_TIMESTAMP)
-  return 0;
-#else
-  return ACE_OS::memcmp (this->time_stamp_,
-                         rhs.creation_time (),
-                         TAO_Creation_Time::creation_time_length ()) != 0;
-#endif /* POA_NO_TIMESTAMP */
-}
-
 ACE_INLINE TAO_POA *
 TAO_POA::clone (const TAO_POA::String &adapter_name,
                 TAO_POA_Manager &poa_manager,
@@ -555,15 +555,6 @@ TAO_POA::id_separator_length (void)
 }
 
 ACE_INLINE char
-TAO_POA::object_key_type (void)
-{
-  if (this->persistent ())
-    return TAO_POA::persistent_key_type ();
-  else
-    return TAO_POA::transient_key_type ();
-}
-
-ACE_INLINE char
 TAO_POA::persistent_key_type (void)
 {
   return 'P';
@@ -575,6 +566,15 @@ TAO_POA::transient_key_type (void)
   return 'T';
 }
 
+ACE_INLINE char
+TAO_POA::object_key_type (void)
+{
+  if (this->persistent ())
+    return TAO_POA::persistent_key_type ();
+  else
+    return TAO_POA::transient_key_type ();
+}
+
 ACE_INLINE CORBA::ULong
 TAO_POA::object_key_type_length (void)
 {