5 files changed, 10 insertions, 28 deletions
diff --git a/src/lib/arch/unix/ArchInternetUnix.cpp b/src/lib/arch/unix/ArchInternetUnix.cpp
index fd1e135..76966dc 100644
--- a/src/lib/arch/unix/ArchInternetUnix.cpp
+++ b/src/lib/arch/unix/ArchInternetUnix.cpp
@@ -28,8 +28,8 @@ class CurlFacade {
 public:
     CurlFacade();
     ~CurlFacade();
-    String                get(const String& url);
-    String                urlEncode(const String& url);
+    std::string get(const std::string& url);
+    std::string urlEncode(const std::string& url);
 
 private:
     CURL*                m_curl;
@@ -39,15 +39,13 @@ private:
 // ArchInternetUnix
 //
 
-String
-ArchInternetUnix::get(const String& url)
+std::string ArchInternetUnix::get(const std::string& url)
 {
     CurlFacade curl;
     return curl.get(url);
 }
 
-String
-ArchInternetUnix::urlEncode(const String& url)
+std::string ArchInternetUnix::urlEncode(const std::string& url)
 {
     CurlFacade curl;
     return curl.urlEncode(url);
@@ -87,8 +85,7 @@ CurlFacade::~CurlFacade()
     curl_global_cleanup();
 }
 
-String
-CurlFacade::get(const String& url)
+std::string CurlFacade::get(const std::string& url)
 {
     curl_easy_setopt(m_curl, CURLOPT_URL, url.c_str());
     curl_easy_setopt(m_curl, CURLOPT_WRITEFUNCTION, curlWriteCallback);
@@ -110,8 +107,7 @@ CurlFacade::get(const String& url)
     return result;
 }
 
-String
-CurlFacade::urlEncode(const String& url)
+std::string CurlFacade::urlEncode(const std::string& url)
 {
     char* resultCStr = curl_easy_escape(m_curl, url.c_str(), 0);
 
diff --git a/src/lib/arch/unix/ArchInternetUnix.h b/src/lib/arch/unix/ArchInternetUnix.h
index 2413d8f..66de656 100644
--- a/src/lib/arch/unix/ArchInternetUnix.h
+++ b/src/lib/arch/unix/ArchInternetUnix.h
@@ -19,10 +19,10 @@
 
 #define ARCH_INTERNET ArchInternetUnix
 
-#include "base/String.h"
+#include <string>
 
 class ArchInternetUnix {
 public:
-    String                get(const String& url);
-    String                urlEncode(const String& url);
+    std::string get(const std::string& url);
+    std::string urlEncode(const std::string& url);
 };
diff --git a/src/lib/arch/unix/ArchMultithreadPosix.cpp b/src/lib/arch/unix/ArchMultithreadPosix.cpp
index c9ddc6c..4866edc 100644
--- a/src/lib/arch/unix/ArchMultithreadPosix.cpp
+++ b/src/lib/arch/unix/ArchMultithreadPosix.cpp
@@ -36,17 +36,6 @@
 
 #define SIGWAKEUP SIGUSR1
 
-#if !HAVE_PTHREAD_SIGNAL
-    // boy, is this platform broken.  forget about pthread signal
-    // handling and let signals through to every process.  barrier
-    // will not terminate cleanly when it gets SIGTERM or SIGINT.
-#    define pthread_sigmask sigprocmask
-#    define pthread_kill(tid_, sig_) kill(0, (sig_))
-#    define sigwait(set_, sig_)
-#    undef HAVE_POSIX_SIGWAIT
-#    define HAVE_POSIX_SIGWAIT 1
-#endif
-
 static
 void
 setSignalSet(sigset_t* sigset)
@@ -344,9 +333,7 @@ ArchMultithreadPosix::newThread(ThreadFunc func, void* data)
     // can't tell the difference.
     if (!m_newThreadCalled) {
         m_newThreadCalled = true;
-#if HAVE_PTHREAD_SIGNAL
         startSignalHandler();
-#endif
     }
 
     // note that the child thread will wait until we release this mutex
diff --git a/src/lib/arch/unix/ArchNetworkBSD.cpp b/src/lib/arch/unix/ArchNetworkBSD.cpp
index 2a9259c..496c988 100644
--- a/src/lib/arch/unix/ArchNetworkBSD.cpp
+++ b/src/lib/arch/unix/ArchNetworkBSD.cpp
@@ -690,7 +690,6 @@ ArchNetworkBSD::nameToAddr(const std::string& name)
     // allocate address
     ArchNetAddressImpl* addr = new ArchNetAddressImpl;
 
-    char ipstr[INET6_ADDRSTRLEN];
     struct addrinfo hints;
     struct addrinfo *p;
     int ret;
diff --git a/src/lib/arch/unix/XArchUnix.h b/src/lib/arch/unix/XArchUnix.h
index ae62f4c..93d6d62 100644
--- a/src/lib/arch/unix/XArchUnix.h
+++ b/src/lib/arch/unix/XArchUnix.h
@@ -24,7 +24,7 @@
 class XArchEvalUnix : public XArchEval {
 public:
     XArchEvalUnix(int error) : m_error(error) { }
-    virtual ~XArchEvalUnix() _NOEXCEPT { }
+    virtual ~XArchEvalUnix() noexcept { }
 
     virtual std::string    eval() const;