Fixes/changes for OS/X compilation

waTeim · waTeim · commit e40716d53414 · 2014-02-13T15:39:17.000-05:00
Added various include directives in http_response.cpp and
http_resource.cpp and modified http_endpoint copy constructor to
make it public to satifify clang.

Fixed typo/bug in http_request::set_requestor_port.

Modified various forwards to match actual declarations.

Modified configure to allow build in same directory.
diff --git a/configure.ac b/configure.ac
@@ -39,10 +39,6 @@ CXXFLAGS=$OLD_CXXFLAGS
 AC_LANG([C++])
 AC_SYS_LARGEFILE
 
-if test "`cd $srcdir; /bin/pwd`" = "`/bin/pwd`"; then 
-	AC_MSG_ERROR("you must configure in a separate build directory")
-fi
-
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADER([string],[],[AC_MSG_ERROR("C++ strings not found")])
diff --git a/src/http_resource.cpp b/src/http_resource.cpp
@@ -17,10 +17,14 @@
      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
+
+#include <stdlib.h>
+
 #include "http_resource.hpp"
 #include "http_utils.hpp"
 #include "http_request.hpp"
 #include "http_response.hpp"
+#include "details/event_tuple.hpp"
 #include "webserver.hpp"
 #include "string_utilities.hpp"
 
diff --git a/src/http_response.cpp b/src/http_response.cpp
@@ -25,9 +25,12 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include "http_utils.hpp"
+#include "details/http_resource_mirror.hpp"
+#include "details/event_tuple.hpp"
 #include "webserver.hpp"
 #include "http_response.hpp"
 
+
 using namespace std;
 
 namespace httpserver
diff --git a/src/httpserver/details/http_endpoint.hpp b/src/httpserver/details/http_endpoint.hpp
@@ -38,7 +38,7 @@ class webserver;
 namespace details
 {
 
-struct http_resource_mirror;
+class http_resource_mirror;
 
 /**
  * Exception class throwed when a bad formatted http url is used
@@ -60,7 +60,7 @@ class bad_http_endpoint : public std::exception
 **/
 class http_endpoint
 {
-    private:
+   public:
         /**
          * Copy constructor. It is useful expecially to copy regex_t structure that contains dinamically allocated data.
          * @param h The http_endpoint to copy
@@ -75,6 +75,7 @@ class http_endpoint
          * @param b The http_endpoint to compare to
          * @return boolean indicating if this is less than b.
         **/
+    private:
         bool operator <(const http_endpoint& b) const;
         /**
          * Operator overload for "assignment operator". It is used to copy endpoints to existing objects.
diff --git a/src/httpserver/http_request.hpp b/src/httpserver/http_request.hpp
@@ -509,7 +509,7 @@ class http_request
          * Method used to set the requestor port
          * @param requestor The requestor port to set
         **/
-        void set_requestor_port(short requestor)
+        void set_requestor_port(short requestor_port)
         {
             this->requestor_port = requestor_port;
         }
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
@@ -60,11 +60,11 @@ struct httpserver_ska;
 };
 
 namespace details {
+    class http_endpoint;
     class http_resource_mirror;
     class event_tuple;
-    class http_endpoint;
-    class daemon_item;
-    class modded_request;
+    struct daemon_item;
+    struct modded_request;
     struct cache_entry;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ class http_request`
`509`	`509`	`* Method used to set the requestor port`
`510`	`510`	`* @param requestor The requestor port to set`
`511`	`511`	`**/`
`512`		`- void set_requestor_port(short requestor)`
	`512`	`+ void set_requestor_port(short requestor_port)`
`513`	`513`	`{`
`514`	`514`	`this->requestor_port = requestor_port;`
`515`	`515`	`}`