2011-11-07 Paolo Carlini <paolo.carlini@oracle.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / profile / impl / profiler_node.h

diff --git a/libstdc++-v3/include/profile/impl/profiler_node.h b/libstdc++-v3/include/profile/impl/profiler_node.h
index d22a3e1..dfaff8c 100644 (file)
--- a/libstdc++-v3/include/profile/impl/profiler_node.h
+++ b/libstdc++-v3/include/profile/impl/profiler_node.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the terms
@@ -48,7 +48,7 @@ namespace __gnu_profile
 {
   typedef const void* __object_t;
   typedef void* __instruction_address_t;
-  typedef std::_GLIBCXX_STD_PR::vector<__instruction_address_t> __stack_npt;
+  typedef std::_GLIBCXX_STD_C::vector<__instruction_address_t> __stack_npt;
   typedef __stack_npt* __stack_t;
 
   std::size_t __stack_max_depth();
@@ -102,10 +102,10 @@ namespace __gnu_profile
       if (!__s) 
        return 0;
 
-      __UINTPTR_TYPE__ __index = 0;
+      std::size_t __index = 0;
       __stack_npt::const_iterator __it;
       for (__it = __s->begin(); __it != __s->end(); ++__it)
-       __index += reinterpret_cast<__UINTPTR_TYPE__>(*__it);
+       __index += reinterpret_cast<std::size_t>(*__it);
       return __index;
     }
 
@@ -148,7 +148,7 @@ namespace __gnu_profile
     __stack() const
     { return _M_stack; }
     
-    virtual void __write(FILE* f) const = 0;
+    virtual void __write(FILE* __f) const = 0;
 
   protected:
     __stack_t _M_stack;