ChangeLogTag: Mon Jun 12 12:00:14 2000 Angelo Corsaro <corsaro@cs.wustl.edu>

3 files changed, 31 insertions, 20 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index da69608970c..2886695205f 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Mon Jun 12 12:00:14 2000  Angelo Corsaro  <corsaro@cs.wustl.edu>
+
+	* tao/MProfile.i
+
+	  Moved <create_policy_list> implementation so that no problem
+	  occurs when inlining is enabled.
+
 Sun Jun 11 20:55:08 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * rules.tao.GNU:
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index dd924bffdb3..95d34a23e7a 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -155,6 +155,14 @@ public:
   // profile and the results are averaged together.
   // NON-THREAD SAFE.
 
+protected:
+
+ void create_policy_list (void);
+  // This method handle the dynamic allocation of the data member
+  // <policy_list_>.
+
+public:
+
   void policy_list (CORBA::PolicyList *policy_list);
   // Sets the policies list associated with the profiles
   // owned by the TAO_MProfile.
@@ -165,12 +173,6 @@ public:
 
 protected:
 
- void create_policy_list (void);
-  // This method handle the dynamic allocation of the data member
-  // <policy_list_>.
-
-protected:
-
   CORBA::PolicyList *policy_list_;
   // Stores the policy list for the profile of this MProfile.
 
diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i
index 453830a3b85..e990af94182 100644
--- a/TAO/tao/MProfile.i
+++ b/TAO/tao/MProfile.i
@@ -249,6 +249,22 @@ TAO_MProfile::add_profile (TAO_Profile *pfile)
   return last_ - 1;
 }
 
+ACE_INLINE void
+TAO_MProfile::create_policy_list (void)
+{
+  // Precondition: Make sure that the policy list
+  // has not already allocated.
+  ACE_ASSERT (this->policy_list_ == 0);
+
+  ACE_NEW (this->policy_list_, CORBA::PolicyList ());
+ 
+  // Post-Condition: Make sure that the memory get allcated
+  // for real.
+  ACE_ASSERT (this->policy_list_ != 0);
+  
+  // @@ Marina & Irfan I would raise an exception in this case.
+}
+
 
 ACE_INLINE void
 TAO_MProfile::policy_list (CORBA::PolicyList *policy_list)
@@ -264,18 +280,4 @@ TAO_MProfile::policy_list (void)
   return policy_list_;
 }
 
-ACE_INLINE void
-TAO_MProfile::create_policy_list (void)
-{
-  // Precondition: Make sure that the policy list
-  // has not already allocated.
-  ACE_ASSERT (this->policy_list_ == 0);
 
-  ACE_NEW (this->policy_list_, CORBA::PolicyList ());
- 
-  // Post-Condition: Make sure that the memory get allcated
-  // for real.
-  ACE_ASSERT (this->policy_list_ != 0);
-  
-  // @@ Marina & Irfan I would raise an exception in this case.
-}