From def238ff08dd90a06e0916876601f9a03f22c510 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 14:51:05 +0700 Subject: Fix C-style struct functor definitions --- Minecraft.World/File.h | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'Minecraft.World/File.h') diff --git a/Minecraft.World/File.h b/Minecraft.World/File.h index 0b710cd4..ae07a4b7 100644 --- a/Minecraft.World/File.h +++ b/Minecraft.World/File.h @@ -1,5 +1,9 @@ #pragma once -using namespace std; + +#include +#include +#include + // 4J Stu - Represents java standard library class class FileFilter; @@ -24,11 +28,11 @@ public: bool exists() const; bool isFile() const; bool renameTo(File dest); - vector *listFiles() const; // Array - vector *listFiles(FileFilter *filter) const; + std::vector *listFiles() const; // Array + std::vector *listFiles(FileFilter *filter) const; bool isDirectory() const; - __int64 length(); - __int64 lastModified(); + int64_t length(); + int64_t lastModified(); const wstring getPath() const; // 4J Jev: TODO wstring getName() const; @@ -43,14 +47,12 @@ private: //File(vector *path); }; -typedef struct +struct FileKeyHash { - int operator() (const File &k) const { return File::hash_fnct(k); } - -} FileKeyHash; + int operator() (const File &k) const; +}; -typedef struct +struct FileKeyEq { - bool operator() (const File &x, const File &y) const {return File::eq_test(x,y); } - -} FileKeyEq; \ No newline at end of file + bool operator() (const File &x, const File &y) const; +}; \ No newline at end of file -- cgit v1.2.3