From ad6f4dfcc671d3f8d458c42b0992956f2a2cf979 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 12 Nov 2009 17:25:51 +0000 Subject: Works with libbu++ changes. --- Makefile | 2 +- src/cache.cpp | 4 ++-- src/cache.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a06f7fa..c1cf095 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -LIBBU:=$(foreach f,paramproc.h paramproc.cpp fstring.h fstring.cpp exceptionbase.cpp exceptionbase.h archive.cpp archive.h archival.cpp archival.h plugger.h plugger.cpp singleton.h hash.cpp hash.h file.h file.cpp stream.h stream.cpp list.h list.cpp set.h set.cpp trace.h trace.cpp util.h fbasicstring.cpp fbasicstring.h sharedcore.cpp sharedcore.h,src/$f) +LIBBU:=$(foreach f,paramproc.h paramproc.cpp fstring.h fstring.cpp exceptionbase.cpp exceptionbase.h archive.cpp archive.h archival.cpp archival.h plugger.h plugger.cpp singleton.h hash.cpp hash.h file.h file.cpp stream.h stream.cpp list.h list.cpp set.h set.cpp trace.h trace.cpp util.h fbasicstring.cpp fbasicstring.h sharedcore.cpp sharedcore.h archivebase.cpp archivebase.h util.h util.cpp,src/$f) SRC:=$(sort $(wildcard src/*.cpp) $(patsubst src/%,src/bu/%,$(filter %.cpp,$(LIBBU)))) OBJ:=src/build.yy.o src/build.tab.o $(patsubst %.cpp,%.o,$(SRC)) REV:=$(shell svn info | grep "Revision" | cut -d\ -f2) diff --git a/src/cache.cpp b/src/cache.cpp index b8e94ec..d2bf537 100644 --- a/src/cache.cpp +++ b/src/cache.cpp @@ -15,7 +15,7 @@ Cache::~Cache() } } -void Cache::archive( class Bu::Archive &ar ) +void Cache::archive( class Bu::ArchiveBase &ar ) { if( ar.isLoading() ) { @@ -87,7 +87,7 @@ void Cache::archive( class Bu::Archive &ar ) { (*i).second = cnt; cnt++; - std::string s = ((*i).first); + Bu::FString s( ((*i).first).c_str(), ((*i).first).size() ); ar << s; } diff --git a/src/cache.h b/src/cache.h index 93b546c..50264de 100644 --- a/src/cache.h +++ b/src/cache.h @@ -14,7 +14,7 @@ public: Cache(); virtual ~Cache(); - virtual void archive( class Bu::Archive &ar ); + virtual void archive( class Bu::ArchiveBase &ar ); class Entry { -- cgit v1.2.3