Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix compile errors
  • Loading branch information
groys committed May 17, 2010
1 parent 55e7b4a commit b5f3606
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
6 changes: 3 additions & 3 deletions src/conf.h
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
};

Expand Down
6 changes: 1 addition & 5 deletions src/scribe_server.cpp
Expand Up @@ -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());
Expand Down Expand Up @@ -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();
Expand Down
1 change: 1 addition & 0 deletions src/scribe_server.h
Expand Up @@ -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;
}
Expand Down

0 comments on commit b5f3606

Please sign in to comment.