diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:09:04 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:09:04 +0000 |
commit | 393f1b414746a7f1977971dd7659dd2b47092b11 (patch) | |
tree | 81d0ca1ee70ab86a7d79c1991abe5c387b655fb2 /src/cachestorefiles.h | |
parent | c259f95bd0e58b247940a339bb9b4b401b4e9438 (diff) | |
parent | 7e25a863325dc3e9762397e700030969e093b087 (diff) | |
download | libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.gz libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.bz2 libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.xz libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.zip |
Wow! Merged the branch, streams are updated, and there's no more FString, run
the fixstrings.sh script in the support directory to (hopefully) automatically
update your projects.
Diffstat (limited to '')
-rw-r--r-- | src/cachestorefiles.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cachestorefiles.h b/src/cachestorefiles.h index c2cf091..426cf83 100644 --- a/src/cachestorefiles.h +++ b/src/cachestorefiles.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -8,7 +8,7 @@ | |||
8 | #ifndef BU_CACHE_STORE_FILES_H | 8 | #ifndef BU_CACHE_STORE_FILES_H |
9 | #define BU_CACHE_STORE_FILES_H | 9 | #define BU_CACHE_STORE_FILES_H |
10 | 10 | ||
11 | #include "bu/fstring.h" | 11 | #include "bu/string.h" |
12 | #include "bu/file.h" | 12 | #include "bu/file.h" |
13 | #include "bu/cachestore.h" | 13 | #include "bu/cachestore.h" |
14 | #include "bu/archive.h" | 14 | #include "bu/archive.h" |
@@ -53,7 +53,7 @@ namespace Bu | |||
53 | class CacheStoreFiles : public CacheStore<keytype, obtype> | 53 | class CacheStoreFiles : public CacheStore<keytype, obtype> |
54 | { | 54 | { |
55 | public: | 55 | public: |
56 | CacheStoreFiles( const Bu::FString &sPrefix ) : | 56 | CacheStoreFiles( const Bu::String &sPrefix ) : |
57 | sPrefix( sPrefix ) | 57 | sPrefix( sPrefix ) |
58 | { | 58 | { |
59 | if( access( sPrefix.getStr(), W_OK|R_OK|X_OK ) ) | 59 | if( access( sPrefix.getStr(), W_OK|R_OK|X_OK ) ) |
@@ -138,7 +138,7 @@ namespace Bu | |||
138 | Bu::MemBuf mb; | 138 | Bu::MemBuf mb; |
139 | Bu::Formatter f( mb ); | 139 | Bu::Formatter f( mb ); |
140 | f << sPrefix << "/"; | 140 | f << sPrefix << "/"; |
141 | Bu::FString sBase = mb.getString(); | 141 | Bu::String sBase = mb.getString(); |
142 | f << key; | 142 | f << key; |
143 | 143 | ||
144 | if( sBase == mb.getString() ) | 144 | if( sBase == mb.getString() ) |
@@ -199,7 +199,7 @@ namespace Bu | |||
199 | } | 199 | } |
200 | 200 | ||
201 | private: | 201 | private: |
202 | Bu::FString sPrefix; | 202 | Bu::String sPrefix; |
203 | }; | 203 | }; |
204 | 204 | ||
205 | }; | 205 | }; |