From 935d6490966f96fc31da9a37465199929309abba Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Mon, 22 Feb 2016 21:07:01 +0200
Subject: [PATCH] More HTTP repository compile tweaks.

---
 simgear/io/HTTPRepository.cxx  | 11 ++++-------
 simgear/io/test_HTTP.hxx       |  2 +-
 simgear/io/test_repository.cxx |  4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/simgear/io/HTTPRepository.cxx b/simgear/io/HTTPRepository.cxx
index f4845b89..fc0913df 100644
--- a/simgear/io/HTTPRepository.cxx
+++ b/simgear/io/HTTPRepository.cxx
@@ -198,12 +198,9 @@ public:
   {
       SGPath p(absolutePath());
       if (p.exists()) {
-// what is indexValid for?
-//          bool indexValid = false;
           try {
               // already exists on disk
               parseDirIndex(children);
-//              indexValid = true;
               std::sort(children.begin(), children.end());
           } catch (sg_exception& e) {
               // parsing cache failed
@@ -386,7 +383,7 @@ private:
     {
         SGPath p(absolutePath());
         p.append(".dirindex");
-        std::ifstream indexStream( p.str().c_str(), std::ios::in );
+        std::ifstream indexStream( p.c_str(), std::ios::in );
 
         if ( !indexStream.is_open() ) {
             throw sg_io_exception("cannot open dirIndex file", p);
@@ -635,7 +632,7 @@ HTTPRepository::failure() const
 
                     // dir index data has changed, so write to disk and update
                     // the hash accordingly
-                    std::ofstream of(pathInRepo().str().c_str(), std::ios::trunc | std::ios::out);
+                    std::ofstream of(pathInRepo().c_str(), std::ios::trunc | std::ios::out);
                     assert(of.is_open());
                     of.write(body.data(), body.size());
                     of.close();
@@ -774,7 +771,7 @@ HTTPRepository::failure() const
         SGPath cachePath = basePath;
         cachePath.append(".hashes");
 
-        std::ofstream stream(cachePath.str().c_str(),std::ios::out | std::ios::trunc);
+        std::ofstream stream(cachePath.c_str(),std::ios::out | std::ios::trunc);
         HashCache::const_iterator it;
         for (it = hashes.begin(); it != hashes.end(); ++it) {
             stream << it->filePath << ":" << it->modTime << ":"
@@ -792,7 +789,7 @@ HTTPRepository::failure() const
             return;
         }
 
-        std::ifstream stream(cachePath.str().c_str(), std::ios::in);
+        std::ifstream stream(cachePath.c_str(), std::ios::in);
         char buf[2048];
         char* lastToken;
 
diff --git a/simgear/io/test_HTTP.hxx b/simgear/io/test_HTTP.hxx
index e7a7c286..6d8861ed 100644
--- a/simgear/io/test_HTTP.hxx
+++ b/simgear/io/test_HTTP.hxx
@@ -181,7 +181,7 @@ public:
 
         open();
         bind(NULL, 2000); // localhost, any port
-        listen(5);
+        listen(16);
 
         _poller.addChannel(this);
     }
diff --git a/simgear/io/test_repository.cxx b/simgear/io/test_repository.cxx
index 382df746..743d1a72 100644
--- a/simgear/io/test_repository.cxx
+++ b/simgear/io/test_repository.cxx
@@ -300,7 +300,7 @@ void createFile(const SGPath& basePath, const std::string& relPath, int revision
 
     std::string prName = comps.at(comps.size() - 2);
     {
-        std::ofstream f(p.str().c_str(), std::ios::trunc | std::ios::out);
+        std::ofstream f(p.c_str(), std::ios::trunc | std::ios::out);
         f << dataForFile(prName, comps.back(), revision);
     }
 }
@@ -378,7 +378,7 @@ void testModifyLocalFiles(HTTP::Client* cl)
     SGPath modFile(p);
     modFile.append("dirB/subdirA/fileBAA");
     {
-        std::ofstream of(modFile.str().c_str(), std::ios::out | std::ios::trunc);
+        std::ofstream of(modFile.c_str(), std::ios::out | std::ios::trunc);
         of << "complete nonsense";
         of.close();
     }