Merge pull request #1176 from Diapolo/project-file

fix DEPENDPATH in the project file, as json has no include sub-dir and src was in twice

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);