From b5f3606f59d394694fe54a54a82a5d1272cdccfb Mon Sep 17 00:00:00 2001
From: groys <groys@facebook.com>
Date: Mon, 17 May 2010 10:02:32 -0700
Subject: [PATCH] fix compile errors

---
 src/conf.h            | 6 +++---
 src/scribe_server.cpp | 6 +-----
 src/scribe_server.h   | 1 +
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/conf.h b/src/conf.h
index 443814ac..e06d5fcb 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -42,10 +42,10 @@ typedef boost::shared_ptr<StoreConf> pStoreConf;
 typedef std::map<std::string, std::string> string_map_t;
 typedef std::map<std::string, pStoreConf> store_conf_map_t;
 
-ostream& operator<<(ostream& os, const StoreConf& storeConf);
+std::ostream& operator<<(std::ostream& os, const StoreConf& storeConf);
 
 class StoreConf {
- friend ostream& operator<<(ostream& os, const StoreConf& storeConf);
+ friend std::ostream& operator<<(std::ostream& os, const StoreConf& storeConf);
  public:
   StoreConf();
   virtual ~StoreConf();
@@ -76,7 +76,7 @@ class StoreConf {
                          /*out*/ StoreConf* parsed_config);
   static std::string trimString(const std::string& str);
   bool readConfFile(const std::string& filename, std::queue<std::string>& _return);
-  ostream& print(ostream& os, uint32_t depth, bool useSpace = true,
+  std::ostream& print(std::ostream& os, uint32_t depth, bool useSpace = true,
                  uint32_t tabw = 2) const;
 };
 
diff --git a/src/scribe_server.cpp b/src/scribe_server.cpp
index 6788259a..a81a1b12 100644
--- a/src/scribe_server.cpp
+++ b/src/scribe_server.cpp
@@ -145,7 +145,7 @@ int main(int argc, char **argv) {
       server->setOverloadAction(T_OVERLOAD_CLOSE_ON_ACCEPT);
     }
 
-    server.serve();
+    server->serve();
 
   } catch(const std::exception& e) {
     LOG_OPER("Exception in main: %s", e.what());
@@ -260,10 +260,6 @@ const char* scribeHandler::statusAsString(fb_status status) {
 bool scribeHandler::createCategoryFromModel(
   const string &category, const boost::shared_ptr<StoreQueue> &model) {
 
-  if (pcategories == NULL) {
-    return false;
-  }
-
   // Make sure the category name is sane.
   try {
     string clean_path = boost::filesystem::path(category).string();
diff --git a/src/scribe_server.h b/src/scribe_server.h
index ad937891..8b3c157a 100644
--- a/src/scribe_server.h
+++ b/src/scribe_server.h
@@ -71,6 +71,7 @@ class scribeHandler : virtual public scribe::thrift::scribeIf,
   inline void setServer(
       boost::shared_ptr<apache::thrift::server::TNonblockingServer> & server) {
     this->server = server;
+  }
   unsigned long getMaxConn() {
     return maxConn;
   }