|
@@ -562,13 +562,13 @@ get_cpu_id_data(int index) {
|
|
|
// Access: Published
|
|
// Access: Published
|
|
|
// Description:
|
|
// Description:
|
|
|
////////////////////////////////////////////////////////////////////
|
|
////////////////////////////////////////////////////////////////////
|
|
|
-char *DisplayInformation::
|
|
|
|
|
|
|
+const char *DisplayInformation::
|
|
|
get_cpu_vendor_string() {
|
|
get_cpu_vendor_string() {
|
|
|
- char *string;
|
|
|
|
|
|
|
+ const char *string;
|
|
|
|
|
|
|
|
string = _cpu_vendor_string;
|
|
string = _cpu_vendor_string;
|
|
|
if (string == 0) {
|
|
if (string == 0) {
|
|
|
- string = (char*) string;
|
|
|
|
|
|
|
+ string = "";
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return string;
|
|
return string;
|
|
@@ -579,13 +579,13 @@ get_cpu_vendor_string() {
|
|
|
// Access: Published
|
|
// Access: Published
|
|
|
// Description:
|
|
// Description:
|
|
|
////////////////////////////////////////////////////////////////////
|
|
////////////////////////////////////////////////////////////////////
|
|
|
-char *DisplayInformation::
|
|
|
|
|
|
|
+const char *DisplayInformation::
|
|
|
get_cpu_brand_string() {
|
|
get_cpu_brand_string() {
|
|
|
- char *string;
|
|
|
|
|
|
|
+ const char *string;
|
|
|
|
|
|
|
|
string = _cpu_brand_string;
|
|
string = _cpu_brand_string;
|
|
|
if (string == 0) {
|
|
if (string == 0) {
|
|
|
- string = (char*) "";
|
|
|
|
|
|
|
+ string = "";
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return string;
|
|
return string;
|