Merge pull request #1171 from Diapolo/fix_compiler_warn

fix 2 compiler warnings

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index a157f41..707c0dc 100644 (file)
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -93,7 +93,7 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
 QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wformat -Wformat-security -Wno-invalid-offsetof -Wno-sign-compare -Wno-unused-parameter
 
 # Input
-DEPENDPATH += src/qt src src json/include
+DEPENDPATH += src src/json src/qt
 HEADERS += src/qt/bitcoingui.h \
     src/qt/transactiontablemodel.h \
     src/qt/addresstablemodel.h \

diff --git a/src/init.cpp b/src/init.cpp
index 0671cd7..3fe6d1b 100644 (file)
--- 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 12ea1ec..fe2aebe 100644 (file)
--- 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 6c3e6c5..5f8d037 100644 (file)
--- 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);