dcplusplus-commit

[Dcplusplus-commit] SF.net SVN: dcplusplus: [621] dcplusplus/trunk/client/ShareManager.cpp

[<arn...@us...>]

Revision: 621
Author:   arnetheduck
Date:     2006-06-18 14:46:33 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/dcplusplus/?rev=621&view=rev

Log Message:
-----------
invalid asserts

Modified Paths:
--------------
    dcplusplus/trunk/client/ShareManager.cpp
Modified: dcplusplus/trunk/client/ShareManager.cpp
===================================================================
--- dcplusplus/trunk/client/ShareManager.cpp	2006-06-18 16:50:11 UTC (rev 620)
+++ dcplusplus/trunk/client/ShareManager.cpp	2006-06-18 21:46:33 UTC (rev 621)
@@ -1180,7 +1180,6 @@
 			if(!newStr.get()) {
 				newStr = auto_ptr<StringSearch::List>(new StringSearch::List(aStrings));
 			}
-			dcassert(find(newStr->begin(), newStr->end(), *k) != newStr->end());
 			newStr->erase(remove(newStr->begin(), newStr->end(), *k), newStr->end());
 		}
 	}
@@ -1312,7 +1311,6 @@
 			if(!newStr.get()) {
 				newStr = auto_ptr<StringSearch::List>(new StringSearch::List(*cur));
 			}
-			dcassert(find(newStr->begin(), newStr->end(), *k) != newStr->end());
 			newStr->erase(remove(newStr->begin(), newStr->end(), *k), newStr->end());
 		}
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dcplusplus-commit] SF.net SVN: dcplusplus: [680] dcplusplus/trunk/client/ShareManager.cpp

[<arn...@us...>]

Revision: 680
          http://svn.sourceforge.net/dcplusplus/?rev=680&view=rev
Author:   arnetheduck
Date:     2006-10-17 23:53:29 -0700 (Tue, 17 Oct 2006)

Log Message:
-----------
Path fix

Modified Paths:
--------------
    dcplusplus/trunk/client/ShareManager.cpp

Modified: dcplusplus/trunk/client/ShareManager.cpp
===================================================================
--- dcplusplus/trunk/client/ShareManager.cpp	2006-10-15 19:06:14 UTC (rev 679)
+++ dcplusplus/trunk/client/ShareManager.cpp	2006-10-18 06:53:29 UTC (rev 680)
@@ -96,7 +96,7 @@
 
 string ShareManager::Directory::getRealPath() const throw() {
 	if(getParent()) {
-		return getParent()->getRealPath() + PATH_SEPARATOR_STR + getName();
+		return getParent()->getRealPath() + getName() + PATH_SEPARATOR_STR;
 	} else {
 		dcassert(ShareManager::getInstance()->getByVirtual(getName()) != ShareManager::getInstance()->directories.end());
 		return ShareManager::getInstance()->getByVirtual(getName())->first;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.