diff options
author | KWSys Upstream <kwrobot@kitware.com> | 2018-06-01 16:53:33 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-06-01 16:54:12 (GMT) |
commit | 3af8c7715b359affce99c575bdcb84ca87585bb2 (patch) | |
tree | bb551a6063ccc08c1fdae71d0a6cd592e369c906 /Directory.cxx | |
parent | 1f52cb087aeb1eef7082884df6423b749e7f50c1 (diff) | |
download | CMake-3af8c7715b359affce99c575bdcb84ca87585bb2.zip CMake-3af8c7715b359affce99c575bdcb84ca87585bb2.tar.gz CMake-3af8c7715b359affce99c575bdcb84ca87585bb2.tar.bz2 |
KWSys 2018-06-01 (8ef62b28)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 8ef62b289e0a99856893ef49106c2b2d94e9dd0c (master).
Upstream Shortlog
-----------------
Brad King (2):
6b9c233c clang-format.bash: update to clang-format-6.0
b7a341cf Empty commit at end of history preceding clang-format-6.0 style transition
Kitware Robot (1):
828b6837 Revise C++ coding style using clang-format-6.0
Diffstat (limited to 'Directory.cxx')
-rw-r--r-- | Directory.cxx | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/Directory.cxx b/Directory.cxx index a84be11..31b1c15 100644 --- a/Directory.cxx +++ b/Directory.cxx @@ -10,9 +10,9 @@ // Work-around CMake dependency scanning limitation. This must // duplicate the above list of headers. #if 0 -#include "Configure.hxx.in" -#include "Directory.hxx.in" -#include "Encoding.hxx.in" +# include "Configure.hxx.in" +# include "Directory.hxx.in" +# include "Encoding.hxx.in" #endif #include <string> @@ -69,37 +69,37 @@ void Directory::Clear() // First Windows platforms #if defined(_WIN32) && !defined(__CYGWIN__) -#include <windows.h> +# include <windows.h> -#include <ctype.h> -#include <fcntl.h> -#include <io.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/stat.h> -#include <sys/types.h> +# include <ctype.h> +# include <fcntl.h> +# include <io.h> +# include <stdio.h> +# include <stdlib.h> +# include <string.h> +# include <sys/stat.h> +# include <sys/types.h> // Wide function names can vary depending on compiler: -#ifdef __BORLANDC__ -#define _wfindfirst_func __wfindfirst -#define _wfindnext_func __wfindnext -#else -#define _wfindfirst_func _wfindfirst -#define _wfindnext_func _wfindnext -#endif +# ifdef __BORLANDC__ +# define _wfindfirst_func __wfindfirst +# define _wfindnext_func __wfindnext +# else +# define _wfindfirst_func _wfindfirst +# define _wfindnext_func _wfindnext +# endif namespace KWSYS_NAMESPACE { bool Directory::Load(const std::string& name) { this->Clear(); -#if (defined(_MSC_VER) && _MSC_VER < 1300) || defined(__BORLANDC__) +# if (defined(_MSC_VER) && _MSC_VER < 1300) || defined(__BORLANDC__) // Older Visual C++ and Embarcadero compilers. long srchHandle; -#else // Newer Visual C++ +# else // Newer Visual C++ intptr_t srchHandle; -#endif +# endif char* buf; size_t n = name.size(); if (*name.rbegin() == '/' || *name.rbegin() == '\\') { @@ -136,12 +136,12 @@ bool Directory::Load(const std::string& name) unsigned long Directory::GetNumberOfFilesInDirectory(const std::string& name) { -#if (defined(_MSC_VER) && _MSC_VER < 1300) || defined(__BORLANDC__) +# if (defined(_MSC_VER) && _MSC_VER < 1300) || defined(__BORLANDC__) // Older Visual C++ and Embarcadero compilers. long srchHandle; -#else // Newer Visual C++ +# else // Newer Visual C++ intptr_t srchHandle; -#endif +# endif char* buf; size_t n = name.size(); if (*name.rbegin() == '/') { @@ -177,23 +177,23 @@ unsigned long Directory::GetNumberOfFilesInDirectory(const std::string& name) // Now the POSIX style directory access -#include <sys/types.h> +# include <sys/types.h> -#include <dirent.h> +# include <dirent.h> // PGI with glibc has trouble with dirent and large file support: // http://www.pgroup.com/userforum/viewtopic.php? // p=1992&sid=f16167f51964f1a68fe5041b8eb213b6 // Work around the problem by mapping dirent the same way as readdir. -#if defined(__PGI) && defined(__GLIBC__) -#define kwsys_dirent_readdir dirent -#define kwsys_dirent_readdir64 dirent64 -#define kwsys_dirent kwsys_dirent_lookup(readdir) -#define kwsys_dirent_lookup(x) kwsys_dirent_lookup_delay(x) -#define kwsys_dirent_lookup_delay(x) kwsys_dirent_##x -#else -#define kwsys_dirent dirent -#endif +# if defined(__PGI) && defined(__GLIBC__) +# define kwsys_dirent_readdir dirent +# define kwsys_dirent_readdir64 dirent64 +# define kwsys_dirent kwsys_dirent_lookup(readdir) +# define kwsys_dirent_lookup(x) kwsys_dirent_lookup_delay(x) +# define kwsys_dirent_lookup_delay(x) kwsys_dirent_##x +# else +# define kwsys_dirent dirent +# endif namespace KWSYS_NAMESPACE { |