diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 4 | ||||
| -rw-r--r-- | src/serialize.h | 2 | ||||
| -rw-r--r-- | src/util.h | 8 |
3 files changed, 2 insertions, 12 deletions
diff --git a/src/init.cpp b/src/init.cpp index 0671cd779..3fe6d1b09 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -584,8 +584,8 @@ bool AppInit2(int argc, char* argv[]) CreateThread(ThreadRPCServer, NULL); #ifdef QT_GUI - if(GetStartOnSystemStartup()) - SetStartOnSystemStartup(true); // Remove startup links to bitcoin-wx + if (GetStartOnSystemStartup()) + SetStartOnSystemStartup(true); // Remove startup links #endif #if !defined(QT_GUI) diff --git a/src/serialize.h b/src/serialize.h index 12ea1ec69..fe2aebe7f 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -1083,8 +1083,6 @@ public: int nType; int nVersion; - typedef FILE element_type; - CAutoFile(FILE* filenew, int nTypeIn, int nVersionIn) { file = filenew; diff --git a/src/util.h b/src/util.h index 6c3e6c545..5f8d0375d 100644 --- a/src/util.h +++ b/src/util.h @@ -302,14 +302,6 @@ typedef boost::interprocess::interprocess_condition CConditionVariable; } -// This is exactly like std::string, but with a custom allocator. -// (secure_allocator<> is defined in serialize.h) -typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString; - - - - - inline std::string i64tostr(int64 n) { return strprintf("%"PRI64d, n); |