Sun Dec 14 17:10:35 2008 Google Inc. <opensource@google.com>

	* google-perftools: version 1.0rc2 release
	* Fix compile error on 64-bit systems (casting ptr to int) (csilvers)

Thu Dec 11 16:01:32 2008  Google Inc. <opensource@google.com>


git-svn-id: http://gperftools.googlecode.com/svn/trunk@62 6b5cf1ce-ec42-a296-1ba9-69fdba395a50

4 files changed, 19 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 4455f45..196700e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec 14 17:10:35 2008  Google Inc. <opensource@google.com>
+	* google-perftools: version 1.0rc2 release
+	* Fix compile error on 64-bit systems (casting ptr to int) (csilvers)
+
 Thu Dec 11 16:01:32 2008  Google Inc. <opensource@google.com>
 
 	* google-perftools: version 1.0rc1 release
diff --git a/configure b/configure
index a7dabdd..b8b7ae6 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for google-perftools 1.0rc1.
+# Generated by GNU Autoconf 2.59 for google-perftools 1.0rc2.
 #
 # Report bugs to <opensource@google.com>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='google-perftools'
 PACKAGE_TARNAME='google-perftools'
-PACKAGE_VERSION='1.0rc1'
-PACKAGE_STRING='google-perftools 1.0rc1'
+PACKAGE_VERSION='1.0rc2'
+PACKAGE_STRING='google-perftools 1.0rc2'
 PACKAGE_BUGREPORT='opensource@google.com'
 
 ac_unique_file="README"
@@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures google-perftools 1.0rc1 to adapt to many kinds of systems.
+\`configure' configures google-perftools 1.0rc2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1021,7 +1021,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of google-perftools 1.0rc1:";;
+     short | recursive ) echo "Configuration of google-perftools 1.0rc2:";;
    esac
   cat <<\_ACEOF
 
@@ -1162,7 +1162,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-google-perftools configure 1.0rc1
+google-perftools configure 1.0rc2
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1176,7 +1176,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by google-perftools $as_me 1.0rc1, which was
+It was created by google-perftools $as_me 1.0rc2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1904,7 +1904,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='google-perftools'
- VERSION='1.0rc1'
+ VERSION='1.0rc2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -24328,7 +24328,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by google-perftools $as_me 1.0rc1, which was
+This file was extended by google-perftools $as_me 1.0rc2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24391,7 +24391,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-google-perftools config.status 1.0rc1
+google-perftools config.status 1.0rc2
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 1e55a70..2536191 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # make sure we're interpreted by some minimal autoconf
 AC_PREREQ(2.57)
 
-AC_INIT(google-perftools, 1.0rc1, opensource@google.com)
+AC_INIT(google-perftools, 1.0rc2, opensource@google.com)
 # The argument here is just something that should be in the current directory
 # (for sanity checking)
 AC_CONFIG_SRCDIR(README)
diff --git a/src/heap-checker.cc b/src/heap-checker.cc
index f5b326c..084f1ec 100644
--- a/src/heap-checker.cc
+++ b/src/heap-checker.cc
@@ -450,7 +450,7 @@ inline int get_thread_disable_counter() {
   if (use_main_thread_counter)  // means we're running really early
     return main_thread_counter;
   void* p = perftools_pthread_getspecific(thread_disable_counter_key);
-  return (int)p;   // kinda evil: store the counter directly in the void*
+  return (intptr_t)p;   // kinda evil: store the counter directly in the void*
 }
 
 inline void set_thread_disable_counter(int value) {
@@ -458,7 +458,9 @@ inline void set_thread_disable_counter(int value) {
     main_thread_counter = value;
     return;
   }
-  void* p = (void*)value; // kinda evil: store the counter directly in the void*
+  intptr_t pointer_sized_value = value;
+  // kinda evil: store the counter directly in the void*
+  void* p = (void*)pointer_sized_value;
   // NOTE: this may call malloc, which will call NewHook which will call
   // get_thread_disable_counter() which will call pthread_getspecific().  I
   // don't know if anything bad can happen if we call getspecific() in the