From 1ef044d6282e17f0dd46f54c2b588ac12a84e5b8 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 27 Sep 2013 05:14:59 -0700 Subject: [PATCH] Build fixes --- modules/beast_asio/http/HTTPVersion.cpp | 8 ++++---- modules/beast_asio/http/HTTPVersion.h | 6 +++--- modules/beast_core/native/bsd_Files.cpp | 4 +--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/beast_asio/http/HTTPVersion.cpp b/modules/beast_asio/http/HTTPVersion.cpp index 7fcf4dc5a..b6e9dfd8b 100644 --- a/modules/beast_asio/http/HTTPVersion.cpp +++ b/modules/beast_asio/http/HTTPVersion.cpp @@ -44,16 +44,16 @@ HTTPVersion& HTTPVersion::operator= (HTTPVersion const& other) String HTTPVersion::toString () const { - return String::fromNumber (major ()) + "." + - String::fromNumber (minor ()); + return String::fromNumber (vmajor ()) + "." + + String::fromNumber (vminor ()); } -unsigned short HTTPVersion::major () const +unsigned short HTTPVersion::vmajor () const { return m_major; } -unsigned short HTTPVersion::minor () const +unsigned short HTTPVersion::vminor () const { return m_minor; } diff --git a/modules/beast_asio/http/HTTPVersion.h b/modules/beast_asio/http/HTTPVersion.h index c3e2a196c..408e63794 100644 --- a/modules/beast_asio/http/HTTPVersion.h +++ b/modules/beast_asio/http/HTTPVersion.h @@ -29,8 +29,8 @@ public: HTTPVersion (HTTPVersion const& other); HTTPVersion& operator= (HTTPVersion const& other); String toString () const; - unsigned short major () const; - unsigned short minor () const; + unsigned short vmajor () const; + unsigned short vminor () const; bool operator== (HTTPVersion const& rhs) const; bool operator!= (HTTPVersion const& rhs) const; bool operator> (HTTPVersion const& rhs) const; @@ -40,7 +40,7 @@ public: private: unsigned short m_major; - unsigned short m_minor;; + unsigned short m_minor; }; #endif diff --git a/modules/beast_core/native/bsd_Files.cpp b/modules/beast_core/native/bsd_Files.cpp index dc6c2dd0a..109b947f1 100644 --- a/modules/beast_core/native/bsd_Files.cpp +++ b/modules/beast_core/native/bsd_Files.cpp @@ -329,9 +329,7 @@ bool Process::openDocument (const String& fileName, const String& parameters) String cmdString (fileName.replace (" ", "\\ ",false)); cmdString << " " << parameters; - if (URL::isProbablyAWebsiteURL (fileName) - || cmdString.startsWithIgnoreCase ("file:") - || URL::isProbablyAnEmailAddress (fileName) + if ( cmdString.startsWithIgnoreCase ("file:") || File::createFileWithoutCheckingPath (fileName).isDirectory() || ! isFileExecutable (fileName)) {