tomasz.sowa
/
winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

removed: operator<<(const PT::Space * space) 

from textstream, log, dbtextstream, htmltextstream
added: compile option: -pthread



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@802 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2012-02-10 00:29:54 +00:00
parent 6e2d00bc5b
commit 9687d5cd66
9 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -6,7 +6,7 @@ CXX = g++
endif
ifndef CXXFLAGS
CXXFLAGS = -fPIC -Wall -pedantic -O2 -I/usr/local/include -I/home/tomek/roboczy/winix -I/home/tomek/roboczy/ezc/src -I/home/tomek/roboczy/tito/src -I/home/tomek/roboczy/pikotools -L/usr/local/lib -DEZC_USE_WINIX_LOGGER -DEZC_HAS_SPECIAL_STREAM
CXXFLAGS = -fPIC -Wall -pedantic -O2 -pthread -I/usr/local/include -I/home/tomek/roboczy/winix -I/home/tomek/roboczy/ezc/src -I/home/tomek/roboczy/tito/src -I/home/tomek/roboczy/pikotools -L/usr/local/lib -DEZC_USE_WINIX_LOGGER -DEZC_HAS_SPECIAL_STREAM
endif
export CXX
@ -26,7 +26,7 @@ winix.so: FORCE
@cd ../ezc/src ; $(MAKE) -e
@cd ../tito/src ; $(MAKE) -e
@cd ../pikotools ; $(MAKE) -e
$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) core/*.o db/*.o functions/*.o templates/*.o notify/*.o ../ezc/src/ezc.a ../tito/src/tito.a ../pikotools/utf8/utf8.a ../pikotools/confparser/confparser.a ../pikotools/mainparser/mainparser.a -lfcgi -lpq -lz -lpthread -lfetch -Wl,-no-whole-archive
$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) core/*.o db/*.o functions/*.o templates/*.o notify/*.o ../ezc/src/ezc.a ../tito/src/tito.a ../pikotools/utf8/utf8.a ../pikotools/confparser/confparser.a ../pikotools/mainparser/mainparser.a -lfcgi -lpq -lz -lfetch -lpthread -Wl,-no-whole-archive
winix: FORCE

10
core/log.cpp
View File

@ -233,16 +233,6 @@ Log & Log::operator<<(double s)
}
Log & Log::operator<<(const PT::Space * s)
{
if( current_level <= log_level )
{
buffer << s;
}
return *this;
}
Log & Log::operator<<(const PT::Space & s)
{

1
core/log.h
View File

@ -43,7 +43,6 @@ public:
Log & operator<<(wchar_t s);
Log & operator<<(size_t s);
Log & operator<<(double s);
Log & operator<<(const PT::Space * space);
Log & operator<<(const PT::Space & space);
Log & operator<<(LogManipulators m);
Log & operator<<(const tm & tm_);

3
core/misc.cpp
View File

@ -536,7 +536,8 @@ return buffer;
// !! IMPROVE ME
// in UNICODE there are some additional white characters
bool IsWhite(wchar_t s)
{
if( s==' ' || s=='\t' || s==13 || s==160 )

14
core/textstream.h
View File

@ -57,7 +57,6 @@ public:
TextStream & operator<<(unsigned long);
TextStream & operator<<(double);
TextStream & operator<<(const void *);// printing a pointer
TextStream & operator<<(const PT::Space * space);
TextStream & operator<<(const PT::Space & space);
TextStream & operator<<(const tm & tm_);
@ -307,19 +306,12 @@ TextStream<StringType> & TextStream<StringType>::write(const wchar_t * buf, size
}
template<class StringType>
TextStream<StringType> & TextStream<StringType>::operator<<(const PT::Space * space)
{
space->Serialize(*this, true, false);
return *this;
}
template<class StringType>
TextStream<StringType> & TextStream<StringType>::operator<<(const PT::Space & space)
{
return operator<<(&space);
space.Serialize(*this, true, false);
return *this;
}

11
db/dbtextstream.cpp
View File

@ -577,12 +577,13 @@ return buffer;
DbTextStream & DbTextStream::operator<<(const PT::Space * space)
DbTextStream & DbTextStream::operator<<(const PT::Space & space)
{
space_stream.Clear();
// !! IMPROVE ME
// we can calculate how much memory is needed before serializing
space->Serialize(space_stream, true, false);
space.Serialize(space_stream, true, false);
operator<<(space_stream.Str());
space_stream.Clear();
@ -590,11 +591,5 @@ return *this;
}
DbTextStream & DbTextStream::operator<<(const PT::Space & space)
{
return operator<<(&space);
}

1
db/dbtextstream.h
View File

@ -152,7 +152,6 @@ public:
DbTextStream & operator<<(const void *);
DbTextStream & operator<<(const tm & t);
DbTextStream & operator<<(const std::vector<long> & tabid);
DbTextStream & operator<<(const PT::Space * space);
DbTextStream & operator<<(const PT::Space & space);

11
templates/htmltextstream.cpp
View File

@ -409,12 +409,13 @@ return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(const PT::Space * space)
HtmlTextStream & HtmlTextStream::operator<<(const PT::Space & space)
{
space_stream.Clear();
// !! IMPROVE ME
// we can calculate how many memory is needed beforehand
space->Serialize(space_stream, true, false);
space.Serialize(space_stream, true, false);
operator<<(space_stream.Str());
space_stream.Clear();
@ -422,9 +423,3 @@ return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(const PT::Space & space)
{
return operator<<(&space);
}

1
templates/htmltextstream.h
View File

@ -144,7 +144,6 @@ public:
HtmlTextStream & operator<<(double);
HtmlTextStream & operator<<(const void *);
HtmlTextStream & operator<<(const tm & t);
HtmlTextStream & operator<<(const PT::Space * space);
HtmlTextStream & operator<<(const PT::Space & space);
private: