[Orxonox-commit 1187] r5908 - code/branches/core5/src/libraries/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-10-08 19:36:28 +0200 (Thu, 08 Oct 2009)
New Revision: 5908

Modified:
   code/branches/core5/src/libraries/core/MemoryArchive.cc
Log:
More boost < 1.36 fixes.

Modified: code/branches/core5/src/libraries/core/MemoryArchive.cc
===================================================================
--- code/branches/core5/src/libraries/core/MemoryArchive.cc	2009-10-08 17:26:06 UTC (rev 5907)
+++ code/branches/core5/src/libraries/core/MemoryArchive.cc	2009-10-08 17:36:28 UTC (rev 5908)
@@ -70,7 +70,7 @@
                 file = file.branch_path();
             if (file.empty())
                 continue;
-            if (file.has_parent_path() && !bRecursive)
+            if (file.has_branch_path() && !bRecursive)
                 continue;
             if (simpleList)
                 simpleList->push_back(file.string());
@@ -79,7 +79,7 @@
                 FileInfo fi;
                 fi.archive = this;
                 fi.filename = file.string();
-                fi.basename = file.filename();
+                fi.basename = file.leaf();
                 fi.path = file.branch_path().string();
                 fi.compressedSize = it->second.second;
                 fi.uncompressedSize = it->second.second;