fixes... mostly autohell

This commit is contained in:
john stone 2014-05-01 22:22:04 +02:00
parent 6834cd55ec
commit b887fa1328
4 changed files with 7 additions and 7 deletions

View File

@ -18,13 +18,13 @@ siccc_SOURCES = \
src/StaticFileHandler.H \ src/StaticFileHandler.H \
src/StaticFileHandler.cc \ src/StaticFileHandler.cc \
src/sicccobject.H \ src/sicccobject.H \
src/sicccobject.H \ src/sicccobject.cc \
src/sicccPersister.H \ src/sicccPersister.H \
src/sicccPersister.cc \ src/sicccPersister.cc \
mongoose/mongoose.c mongoose/mongoose.c
siccc_CFLAGS = siccc_CFLAGS =
siccc_CXXFLAGS = $(LIBJANSON_CFLAGS) ${AM_CXXFLAGS} -DDEBUG -ggdb -I./mongoose/ siccc_CXXFLAGS = $(LIBJANSSONSTUFF_CFLAGS) ${AM_CXXFLAGS} -DDEBUG -ggdb -I./mongoose/
siccc_LDFLAGS = $(LIBJANSON_LIBS) -ldl -pthread siccc_LDFLAGS = $(LIBJANSSONSTUFF_LIBS) -ldl -pthread
EXTRA_DIST= static/* src/eventlist.txt EXTRA_DIST= static/* src/eventlist.txt
GPERFFLAGS = -C -k2 -LC++ -ZFoohash -Kname -H hacksh --null-strings -E -n -t -S1 GPERFFLAGS = -C -k2 -LC++ -ZFoohash -Kname -H hacksh --null-strings -E -n -t -S1

View File

@ -12,7 +12,7 @@ AC_PROG_CC
AM_PROG_CC_C_O AM_PROG_CC_C_O
AC_PROG_CXX AC_PROG_CXX
PKG_CHECK_MODULES([LIBJANSSONSTUFF],[jansson >= 2.3.1]) PKG_CHECK_MODULES([LIBJANSSONSTUFF],[jansson >= 2.6])
AM_MISSING_PROG([GPERF], [gperf]) AM_MISSING_PROG([GPERF], [gperf])

View File

@ -8,9 +8,9 @@ std::string DynamicObjects::render_object_list(){
<ul id="down"> <ul id="down">
)FOO"; )FOO";
for (auto it : this->_themap){ for (auto& it : this->m_themap){
output += u8"<li>\n"; output += u8"<li>\n";
output += u8"<a href=\"" + m_merouterin.get_baseurl() + it.get_path() + u8"\">"; //we could include baseurl here? output += u8"<a href=\"" + m_merouterin->get_baseurl() + it.get_path() + u8"\">"; //we could include baseurl here?
output += it.get_filename(); output += it.get_filename();
output += u8"</a> <span class=\"size\">"; output += u8"</a> <span class=\"size\">";
output += it.get_pretty_sized(); output += it.get_pretty_sized();

View File

@ -41,7 +41,7 @@ public:
return rouri->event_fallback_route(event); return rouri->event_fallback_route(event);
} }
} }
std::string & get_baseurl(){return _baseurl;} std::string const & get_baseurl()const{return _baseurl;}
void set_baseurl(std::string baseurl); void set_baseurl(std::string baseurl);
private: private:
explicit Routerin(); explicit Routerin();