Merge branch 'master' of git@f-r-e-i.de:/home/git/repo/crepublib

Conflicts:
	base/ReDirectory.cpp
	base/ReDirectory.hpp
	base/ReSerializable.cpp
	cunit/cuReDirTools.cpp
	os/ReDirTools.cpp
	os/ReTraverser.cpp

diff --cc base/rebase.hpp
Simple merge

diff --cc cunit/cuReFileUtils.cpp
index fcdc7c8118f09acd721d2c7bf68839a6770132e5,5b43af60e1638b567535afdf565f5e5486e07e71..aafd43db5ab0aa62bba1ad68e9c41eb8839b6dde
--- 1/cunit/cuReFileUtils.cpp
--- 2/cunit/cuReFileUtils.cpp
+++ b/cunit/cuReFileUtils.cpp
@@@ -36,10 -36,10 +36,10 @@@ private
                ReFileUtils::readString("/./././.", buffer);
                checkEqu("", buffer);
        }
 -      void testSetFiles(){
 +      void testSetFiles() {
                ReByteArray name = ReFileUtils::tempFile("setfile_test.dat");
                struct stat info;
-               unlink(name.str());
+               _unlink(name.str());
                ReFileUtils::writeString(name.str(), "");
                checkEqu(0, stat(name.str(), &info));
                struct tm time1;
@@@ -55,13 -55,18 +55,18 @@@
                ReFileUtils::timeToFiletime(time2, time3);
                ReFileTime_t time4;
                int diff = 86400 + 2 * 3600 + 3 * 60 + 2;
 -              ReFileUtils::timeToFiletime(time2 +  diff, time4);
 +              ReFileUtils::timeToFiletime(time2 + diff, time4);
                ReFileUtils::setTimes(name.str(), time3, &time4, NULL);
                checkEqu(0, stat(name.str(), &info));
+ #if defined __linux__
                checkT(time2 == info.st_mtim.tv_sec);
                checkT(time2 + diff == info.st_atim.tv_sec);
+ #elif defined __WIN32__
+               checkT(time2 == info.st_mtime);
+               checkT(time2 + diff == info.st_atime);
+ #endif
        }
 -      void testTempFile(){
 +      void testTempFile() {
                const char* subdir = "refileutiltest";
                const char* node = "test1.$$.txt";
                ReByteArray dir = ReFileUtils::tempDir(subdir);

diff --cc net/ReTCP.cpp
Simple merge

diff --cc os/ReDirTools.hpp
Simple merge