From 3557012e6e06e019565fc31021dced5ab842b9eb Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 5 Oct 2009 18:10:18 +0000
Subject: [PATCH] report cpu info

---
 panda/src/display/displayInformation.cxx | 12 ++++++------
 panda/src/display/displayInformation.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/panda/src/display/displayInformation.cxx b/panda/src/display/displayInformation.cxx
index 3c77112ec8..b8e5ba3e91 100644
--- a/panda/src/display/displayInformation.cxx
+++ b/panda/src/display/displayInformation.cxx
@@ -562,13 +562,13 @@ get_cpu_id_data(int index) {
 //       Access: Published
 //  Description:  
 ////////////////////////////////////////////////////////////////////
-char *DisplayInformation::
+const char *DisplayInformation::
 get_cpu_vendor_string() {  
-  char *string;
+  const char *string;
   
   string = _cpu_vendor_string;
   if (string == 0) {
-    string = (char*) string;
+    string = "";
   }
   
   return string;
@@ -579,13 +579,13 @@ get_cpu_vendor_string() {
 //       Access: Published
 //  Description:  
 ////////////////////////////////////////////////////////////////////
-char *DisplayInformation::
+const char *DisplayInformation::
 get_cpu_brand_string() {  
-  char *string;
+  const char *string;
   
   string = _cpu_brand_string;
   if (string == 0) {
-    string = (char*) "";
+    string = "";
   }
   
   return string;
diff --git a/panda/src/display/displayInformation.h b/panda/src/display/displayInformation.h
index b9cc20470f..df158e45f3 100644
--- a/panda/src/display/displayInformation.h
+++ b/panda/src/display/displayInformation.h
@@ -94,8 +94,8 @@ PUBLISHED:
   int get_cpu_id_size();
   unsigned int get_cpu_id_data(int index);
 
-  char *get_cpu_vendor_string();
-  char *get_cpu_brand_string();
+  const char *get_cpu_vendor_string();
+  const char *get_cpu_brand_string();
   unsigned int get_cpu_version_information();
   unsigned int get_cpu_brand_index();