From 4fa6500b5107f9d300a6ab7b6f011fb19621b05c Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 28 Oct 2010 18:09:09 -0400 Subject: STORM-480 remove unused "wrap" parameter from LLDir::getNetFileInDir --HG-- branch : storm-102 --- indra/llvfs/lldir_win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llvfs/lldir_win32.h') diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h index d3e45dc1f3..2ec9025250 100644 --- a/indra/llvfs/lldir_win32.h +++ b/indra/llvfs/lldir_win32.h @@ -40,7 +40,7 @@ public: /*virtual*/ std::string getCurPath(); /*virtual*/ U32 countFilesInDir(const std::string &dirname, const std::string &mask); - /*virtual*/ BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname, BOOL wrap); + /*virtual*/ BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname); /*virtual*/ void getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname); /*virtual*/ BOOL fileExists(const std::string &filename) const; -- cgit v1.2.3 From 330978decd15e02d7cd23dcead52dc2373d7e5d5 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 28 Oct 2010 22:40:37 -0400 Subject: STORM-480 remove (unused) LLDir::getRandomFileInDir --HG-- branch : storm-102 --- indra/llvfs/lldir_win32.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/llvfs/lldir_win32.h') diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h index 2ec9025250..38ae690d89 100644 --- a/indra/llvfs/lldir_win32.h +++ b/indra/llvfs/lldir_win32.h @@ -41,7 +41,6 @@ public: /*virtual*/ std::string getCurPath(); /*virtual*/ U32 countFilesInDir(const std::string &dirname, const std::string &mask); /*virtual*/ BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname); - /*virtual*/ void getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname); /*virtual*/ BOOL fileExists(const std::string &filename) const; /*virtual*/ std::string getLLPluginLauncher(); -- cgit v1.2.3 From a2bb621f3b74bdb49bf8b6fc3eb6141cf0d8b27a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 29 Oct 2010 07:17:41 -0400 Subject: fix private member declaration in windows implementation of LLDir::getNextFileInDir for STORM-480 --HG-- branch : storm-102 --- indra/llvfs/lldir_win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llvfs/lldir_win32.h') diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h index 38ae690d89..4c932c932c 100644 --- a/indra/llvfs/lldir_win32.h +++ b/indra/llvfs/lldir_win32.h @@ -47,7 +47,7 @@ public: /*virtual*/ std::string getLLPluginFilename(std::string base_name); private: - BOOL LLDir_Win32::getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname, BOOL wrap); + BOOL LLDir_Win32::getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname); void* mDirSearch_h; llutf16string mCurrentDir; -- cgit v1.2.3 From 29b3207fe433497c60feff0b1f71b7fdb27412e1 Mon Sep 17 00:00:00 2001 From: Boroondas Gupte Date: Fri, 11 Feb 2011 01:27:01 +0100 Subject: OPEN-29 Error out if lldir_.h is included when building for a different platform As far as I know, there is no good reason to include e.g. indra/llvfs/lldir_win32.h while not building for a windows target, so be better prevent this to avoid hard to find errors. --- indra/llvfs/lldir_win32.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/llvfs/lldir_win32.h') diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h index 4c932c932c..1d0a692883 100644 --- a/indra/llvfs/lldir_win32.h +++ b/indra/llvfs/lldir_win32.h @@ -24,6 +24,10 @@ * $/LicenseInfo$ */ +#if !LL_WINDOWS +#error This header must not be included when compiling for any target other than Windows. Consider including lldir.h instead. +#endif // !LL_WINDOWS + #ifndef LL_LLDIR_WIN32_H #define LL_LLDIR_WIN32_H -- cgit v1.2.3 From 627c7634398e03145f297e91a8e93c0bbba00e33 Mon Sep 17 00:00:00 2001 From: Boroondas Gupte Date: Fri, 11 Feb 2011 01:35:21 +0100 Subject: =?UTF-8?q?OPEN-29=20Cleanup:=20removed=20extra=20qualification=20?= =?UTF-8?q?=E2=80=98LLDir=5FWin32::=E2=80=99=20on=20member=20=E2=80=98getN?= =?UTF-8?q?extFileInDir=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before OPEN-29, when lldir_win32.h would have been included when building for Linux, GCC would error out with indra/llvfs/lldir_win32.h:50: error: extra qualification ‘LLDir_Win32::’ on member ‘getNextFileInDir’ which, although unintended, probably was a Good Thing (TM), as this would have aborted the build, so that the wrong include would be noticed. Now that we explicitly error out with a (hopefully) useful error message, this isn't needed anymore. --- indra/llvfs/lldir_win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llvfs/lldir_win32.h') diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h index 1d0a692883..8a97a248dd 100644 --- a/indra/llvfs/lldir_win32.h +++ b/indra/llvfs/lldir_win32.h @@ -51,7 +51,7 @@ public: /*virtual*/ std::string getLLPluginFilename(std::string base_name); private: - BOOL LLDir_Win32::getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname); + BOOL getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname); void* mDirSearch_h; llutf16string mCurrentDir; -- cgit v1.2.3 From 1d0001020716d3f3d3734dd4a4f8cd609bc2b215 Mon Sep 17 00:00:00 2001 From: Boroondas Gupte Date: Fri, 11 Feb 2011 02:09:20 +0100 Subject: OPEN-29 Cleanup: strip trailing whitespace As people will have to rebuild half the tree anyway, because these headers changed, we might as well prettify them a bit. --- indra/llvfs/lldir_win32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llvfs/lldir_win32.h') diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h index 8a97a248dd..b170ebbcd7 100644 --- a/indra/llvfs/lldir_win32.h +++ b/indra/llvfs/lldir_win32.h @@ -52,7 +52,7 @@ public: private: BOOL getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname); - + void* mDirSearch_h; llutf16string mCurrentDir; }; -- cgit v1.2.3