Browse Source

report cpu info

David Rose 16 years ago
parent
commit
3557012e6e

+ 6 - 6
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;

+ 2 - 2
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();