diff --git a/Builds/VisualStudio2013/RippleD.props b/Builds/VisualStudio2013/Common.props similarity index 95% rename from Builds/VisualStudio2013/RippleD.props rename to Builds/VisualStudio2013/Common.props index 71e2d474dc..e39132ab48 100644 --- a/Builds/VisualStudio2013/RippleD.props +++ b/Builds/VisualStudio2013/Common.props @@ -21,6 +21,8 @@ Shlwapi.lib;%(AdditionalDependencies) + + diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj index bc51e9eaf8..68d76712f1 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj +++ b/Builds/VisualStudio2013/RippleD.vcxproj @@ -829,6 +829,8 @@ true true + true + true true @@ -2867,20 +2869,24 @@ + + - + + - + + - + + - @@ -2925,6 +2931,7 @@ false true false + %(AdditionalIncludeDirectories) Console diff --git a/Builds/VisualStudio2013/Win32.props b/Builds/VisualStudio2013/Win32.props new file mode 100644 index 0000000000..73bc6ee62c --- /dev/null +++ b/Builds/VisualStudio2013/Win32.props @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Builds/VisualStudio2013/x64.props b/Builds/VisualStudio2013/x64.props new file mode 100644 index 0000000000..49f58f5039 --- /dev/null +++ b/Builds/VisualStudio2013/x64.props @@ -0,0 +1,12 @@ + + + + + + + + 4018;4244;4267 + + + + \ No newline at end of file diff --git a/SConstruct b/SConstruct index e089d0d8e5..e997deb32d 100644 --- a/SConstruct +++ b/SConstruct @@ -335,10 +335,11 @@ if not USING_CLANG: else: # This disables the "You said it was a struct AND a class, wth is going on # warnings" - more_warnings = ['-Wno-mismatched-tags'] + more_warnings = ['-Wno-mismatched-tags'] # add '-Wshorten-64-to-32' some day # This needs to be a CCFLAGS not a CXXFLAGS env.Append(CCFLAGS = more_warnings) +# add '-Wconversion' some day env.Append(CXXFLAGS = ['-O3', '-fno-strict-aliasing', '-pthread', '-Wno-invalid-offsetof', '-Wformat']+more_warnings+DEBUGFLAGS) # RTTI is required for Beast and CountedObject. diff --git a/src/ripple_core/nodestore/backend/LevelDBFactory.cpp b/src/ripple_core/nodestore/backend/LevelDBFactory.cpp index 035829549d..31ebe9d372 100644 --- a/src/ripple_core/nodestore/backend/LevelDBFactory.cpp +++ b/src/ripple_core/nodestore/backend/LevelDBFactory.cpp @@ -226,6 +226,10 @@ public: m_lruCache.reset (options.block_cache); } + ~LevelDBFactory() + { + } + beast::String getName () const { return "LevelDB";