[llvm-commits] CVS: llvm-java/lib/ClassFile/ClassFile.cpp

[Alkis Evlogimenos]

Changes in directory llvm-java/lib/ClassFile:

ClassFile.cpp updated: 1.45 -> 1.46
---
Log message:

Changes to make this compile with LLVM current

---
Diffs of the changes:  (+5 -2)

 ClassFile.cpp |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


Index: llvm-java/lib/ClassFile/ClassFile.cpp
diff -u llvm-java/lib/ClassFile/ClassFile.cpp:1.45 llvm-java/lib/ClassFile/ClassFile.cpp:1.46
--- llvm-java/lib/ClassFile/ClassFile.cpp:1.45	Fri Apr  1 12:42:38 2005
+++ llvm-java/lib/ClassFile/ClassFile.cpp	Tue Aug 23 19:24:58 2005
@@ -135,7 +135,10 @@
   unsigned b = 0, e = 0;
   do {
     e = ClassPath.find(':', b);
-    if (path.setDirectory(ClassPath.substr(b, e - b))) {
+    // FIXME: Currently we only support flat class file reading. When
+    // jar files are supported this chech has to change to not require
+    // that each CLASSPATH component is a directory.
+    if (path.set(ClassPath.substr(b, e - b)) && path.isDirectory()) {
       result.push_back(path);
       DEBUG(std::cerr << "Adding: " << path.toString() << " to CLASSPATH\n");
     }
@@ -160,7 +163,7 @@
   for (unsigned i = 0, e = classpath.size(); i != e; ++i) {
     sys::Path filename = classpath[i];
     assert(filename.isDirectory() && "CLASSPATH element not a directory!");
-    filename.appendFile(clazz);
+    filename.appendComponent(clazz);
     DEBUG(std::cerr << "Trying file: " << filename.toString() << '\n');
     if (filename.exists())
       return filename;