*合并master到minimal分支

1 files changed, 5 insertions, 5 deletions

diff --git a/src/libjin/Filesystem/je_asset_database.h b/src/libjin/Filesystem/je_asset_database.h
index 8c30fc1..e8b1bd1 100644
--- a/src/libjin/Filesystem/je_asset_database.h
+++ b/src/libjin/Filesystem/je_asset_database.h
@@ -1,12 +1,12 @@
-#ifndef __JE_ASSET_DATABASE_H
-#define __JE_ASSET_DATABASE_H
+#ifndef __JE_ASSET_DATABASE_H__
+#define __JE_ASSET_DATABASE_H__
 
 #include "../core/je_configuration.h"
 #if defined(jin_filesystem)
 
 #include <vector>
 
-#include "../3rdparty/smount/smount.h"
+#include "smount/smount.h"
 
 #include "je_buffer.h"
 
@@ -70,7 +70,7 @@ namespace JinEngine
             /// @param buffer Buffer to fill.
             /// @return True if read sucessful, otherwise return false.
             ///
-			bool read(const char* path, Buffer& buffer);
+			void read(const char* path, Buffer& buffer);
 
             ///
             /// Read file and return data content.
@@ -88,7 +88,7 @@ namespace JinEngine
             /// @param recursive Recursivily search folder. 
             /// @return File list under given directory.
             ///
-            std::vector<std::string> getFiles(const char* path, bool recursive);
+            std::vector<std::string> getFiles(const char* directory, bool recursive = false);
 
             ///
             /// Get full path of asset.