1 files changed, 3 insertions, 1 deletions
diff --git a/src/dex_file.cc b/src/dex_file.cc
index 35e98db020..90893cb155 100644
--- a/src/dex_file.cc
+++ b/src/dex_file.cc
@@ -34,7 +34,9 @@ DexFile::ClassPathEntry DexFile::FindInClassPath(const StringPiece& descriptor,
       return ClassPathEntry(dex_file, dex_class_def);
     }
   }
-  return ClassPathEntry(NULL, NULL);
+  // TODO remove reinterpret_cast when issue with -std=gnu++0x host issue resolved
+  return ClassPathEntry(reinterpret_cast<const DexFile*>(NULL),
+                        reinterpret_cast<const DexFile::ClassDef*>(NULL));
 }
 
 DexFile::Closer::~Closer() {}