TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
David Rose 2000-11-21 00:27:53 +00:00
parent 2ede38216f
commit 074450cbce
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandatool/src/cvscopy/cvsSourceDirectory.cxx
View File

@ -97,13 +97,13 @@ get_rel_to(const CVSSourceDirectory *other) const {
while (a->_depth > b->_depth) { while (a->_depth > b->_depth) {
prefix += "../"; prefix += "../";
a = a->_parent; a = a->_parent;
assert(a != (CVSSourceDirectory *)NULL); nassertr(a != (CVSSourceDirectory *)NULL, string());
} }
while (b->_depth > a->_depth) { while (b->_depth > a->_depth) {
postfix = b->_dirname + "/" + postfix; postfix = b->_dirname + "/" + postfix;
b = b->_parent; b = b->_parent;
assert(b != (CVSSourceDirectory *)NULL); nassertr(b != (CVSSourceDirectory *)NULL, string());
} }
while (a != b) { while (a != b) {
@ -111,12 +111,12 @@ get_rel_to(const CVSSourceDirectory *other) const {
postfix = b->_dirname + "/" + postfix; postfix = b->_dirname + "/" + postfix;
a = a->_parent; a = a->_parent;
b = b->_parent; b = b->_parent;
assert(a != (CVSSourceDirectory *)NULL); nassertr(a != (CVSSourceDirectory *)NULL, string());
assert(b != (CVSSourceDirectory *)NULL); nassertr(b != (CVSSourceDirectory *)NULL, string());
} }
string result = prefix + postfix; string result = prefix + postfix;
assert(!result.empty()); nassertr(!result.empty(), string());
return result.substr(0, result.length() - 1); return result.substr(0, result.length() - 1);
} }