more changes

1 files changed, 10 insertions, 7 deletions

diff --git a/ACE/ace/Live_P_Strategy.inl b/ACE/ace/Live_P_Strategy.inl
index 7e56f69991a..9dd059fe4ba 100644
--- a/ACE/ace/Live_P_Strategy.inl
+++ b/ACE/ace/Live_P_Strategy.inl
@@ -19,7 +19,17 @@ struct AnnotationNode {
   int larger_right;
 };
 
+namespace {
 
+   int min(int a, int b) {
+     return (a < b)? a : b;
+   }
+   
+   int MIN_THREE(int a, int b, int c) {
+     return (a < b) ? min(a,c) : min(b,c);
+   }
+  
+}
 
 class Live_P_Tree : public ACE_RB_Tree<int, AnnotationNode, ACE_Equal_To<int>, ACE_Thread_Mutex> {
 
@@ -36,13 +46,6 @@ private:
    void recalculate_augmentation(ACE_RB_Tree_Node<int, AnnotationNode>* nodePtr);
    void recalculate_augmentation_up(ACE_RB_Tree_Node<int, AnnotationNode>* x);
    int calc_max_i(ACE_RB_Tree_Node<int, AnnotationNode>* nodePtr, int extra) const;
-   static int MIN(int a, int b) 
-   { 
-     return (a < b)? a : b;
-   }
-   static int MIN_THREE(int a, int b, int c) {
-     return (a < b)? Live_P_Tree::MIN(a,c): Live_P_Tree::MIN(b,c);
-   }
    int T_;
 };