From 56e4178f2de87fc66ab3965ee96d6691d84f4d04 Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 20 Dec 2007 02:02:25 +0000 Subject: [PATCH] compile on windows --- dtool/src/prc/configDeclaration.I | 2 +- dtool/src/prc/configDeclaration.cxx | 16 ++++++++-------- dtool/src/prc/configDeclaration.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dtool/src/prc/configDeclaration.I b/dtool/src/prc/configDeclaration.I index ef5b7ea085..d333b69e9b 100644 --- a/dtool/src/prc/configDeclaration.I +++ b/dtool/src/prc/configDeclaration.I @@ -238,7 +238,7 @@ get_int64_word(int n) const { // return a partial answer if there was one. if (has_string_word(n)) { ((ConfigDeclaration *)this)->check_int64_word(n); - return _words[n]._int64; + return _words[n]._int_64; } return 0; } diff --git a/dtool/src/prc/configDeclaration.cxx b/dtool/src/prc/configDeclaration.cxx index 29180865d3..705c80d851 100644 --- a/dtool/src/prc/configDeclaration.cxx +++ b/dtool/src/prc/configDeclaration.cxx @@ -136,7 +136,7 @@ set_int64_word(int n, PN_int64 value) { set_string_word(n, strm.str()); _words[n]._flags |= (F_checked_int64 | F_valid_int64); - _words[n]._int64 = value; + _words[n]._int_64 = value; invalidate_cache(); } @@ -331,7 +331,7 @@ check_int64_word(int n) { if ((word._flags & F_checked_int64) == 0) { word._flags |= F_checked_int64; - word._int64 = 0; + word._int_64 = 0; bool overflow = false; string::const_iterator pi = word._str.begin(); @@ -339,24 +339,24 @@ check_int64_word(int n) { ++pi; // Negative number. while (pi != word._str.end() && isdigit(*pi)) { - PN_int64 next = word._int64 * 10 - (int)((*pi) - '0'); - if ((PN_int64)(next / 10) != word._int64) { + PN_int64 next = word._int_64 * 10 - (int)((*pi) - '0'); + if ((PN_int64)(next / 10) != word._int_64) { // Overflow. overflow = true; } - word._int64 = next; + word._int_64 = next; ++pi; } } else { // Positive number. while (pi != word._str.end() && isdigit(*pi)) { - PN_int64 next = word._int64 * 10 + (int)((*pi) - '0'); - if ((PN_int64)(next / 10) != word._int64) { + PN_int64 next = word._int_64 * 10 + (int)((*pi) - '0'); + if ((PN_int64)(next / 10) != word._int_64) { // Overflow. overflow = true; } - word._int64 = next; + word._int_64 = next; ++pi; } } diff --git a/dtool/src/prc/configDeclaration.h b/dtool/src/prc/configDeclaration.h index b9dc5c179d..97388d2622 100644 --- a/dtool/src/prc/configDeclaration.h +++ b/dtool/src/prc/configDeclaration.h @@ -111,7 +111,7 @@ private: string _str; bool _bool; int _int; - PN_int64 _int64; + PN_int64 _int_64; double _double; short _flags; };