fixes for win32

bawerd · Aug 1, 2011 · 135b5a8 · 135b5a8
1 parent 3c4a09c
commit 135b5a8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/unittests/cursor.cpp b/unittests/cursor.cpp
@@ -300,8 +300,6 @@ class NoTxnCursorTest : public BaseCursorTest
 
     virtual void setup() 
     { 
-        __super::setup();
-
         BFC_ASSERT((m_alloc=memtracker_new())!=0);
 
         BFC_ASSERT_EQUAL(0, ham_new(&m_db));
@@ -332,8 +330,6 @@ class LongTxnCursorTest : public BaseCursorTest
 public:
     virtual void setup() 
     { 
-        __super::setup();
-
         BFC_ASSERT((m_alloc=memtracker_new())!=0);
 
         BFC_ASSERT_EQUAL(0, ham_new(&m_db));
@@ -3679,8 +3675,6 @@ class DupeCacheTest : public hamsterDB_fixture
 
     virtual void setup() 
     { 
-        __super::setup();
-
         BFC_ASSERT((m_alloc=memtracker_new())!=0);
 
         BFC_ASSERT_EQUAL(0, ham_new(&m_db));
@@ -3698,8 +3692,6 @@ class DupeCacheTest : public hamsterDB_fixture
 
     virtual void teardown() 
     { 
-        __super::teardown();
-
         BFC_ASSERT_EQUAL(0, ham_cursor_close(m_cursor));
         BFC_ASSERT_EQUAL(0, ham_close(m_db, HAM_TXN_AUTO_COMMIT));
         BFC_ASSERT_EQUAL(0, ham_env_close(m_env, HAM_AUTO_CLEANUP));
@@ -4040,7 +4032,7 @@ class DupeCursorTest : public hamsterDB_fixture
 
     virtual void setup() 
     { 
-        __super::setup();
+        //__super::setup();
 
         BFC_ASSERT((m_alloc=memtracker_new())!=0);
 
@@ -4060,8 +4052,6 @@ class DupeCursorTest : public hamsterDB_fixture
 
     virtual void teardown() 
     { 
-        __super::teardown();
-
         BFC_ASSERT_EQUAL(0, ham_cursor_close(m_cursor));
         if (m_txn)
             BFC_ASSERT_EQUAL(0, ham_txn_commit(m_txn, 0));
@@ -4693,7 +4683,7 @@ class DupeCursorTest : public hamsterDB_fixture
 
     void insertFirstTest(void)
     {
-        static int C=2;
+        static const int C=2;
         /* B 1 3     */
         /* T     5 7 */
         ham_cursor_t *c[C];
@@ -4736,7 +4726,7 @@ class DupeCursorTest : public hamsterDB_fixture
 
     void insertLastTest(void)
     {
-        static int C=2;
+        static const int C=2;
         /* B 1 3     */
         /* T     5 7 */
         ham_cursor_t *c[C];
@@ -4780,7 +4770,7 @@ class DupeCursorTest : public hamsterDB_fixture
 
     void insertAfterTest(void)
     {
-        static int C=4;
+        static const int C=4;
         /* B 1 3     */
         /* T     5 7 */
         ham_cursor_t *c[C];
@@ -5762,7 +5752,7 @@ class DupeCursorTest : public hamsterDB_fixture
 
     void eraseFirstTest(void)
     {
-        static int C=2;
+        static const int C=2;
         /* B 1 3     */
         /* T     5 7 */
         ham_cursor_t *c[C];
@@ -5803,7 +5793,7 @@ class DupeCursorTest : public hamsterDB_fixture
 
     void eraseLastTest(void)
     {
-        static int C=2;
+        static const int C=2;
         /* B 1 3     */
         /* T     5 7 */
         ham_cursor_t *c[C];
@@ -5844,7 +5834,7 @@ class DupeCursorTest : public hamsterDB_fixture
 
     void eraseAfterTest(void)
     {
-        static int C=4;
+        static const int C=4;
         /* B 1 3     */
         /* T     5 7 */
         ham_cursor_t *c[C];
@@ -5899,7 +5889,7 @@ class DupeCursorTest : public hamsterDB_fixture
 
     void eraseBeforeTest(void)
     {
-        const int C=4;
+        static const int C=4;
         /* B 1 3     */
         /* T     5 7 */
         ham_cursor_t *c[C];

diff --git a/win32/server_dll.vcproj b/win32/server_dll.vcproj
@@ -122,7 +122,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""
+				AdditionalIncludeDirectories="../3rdparty;../include;../src"
 				PreprocessorDefinitions="WIN32;WIN64;_DEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;HAM_LITTLE_ENDIAN;_CRT_SECURE_NO_DEPRECATE;HAM_ENABLE_REMOTE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -278,7 +278,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
+				AdditionalIncludeDirectories="../3rdparty;../include;../src"
 				PreprocessorDefinitions="WIN32;WIN64;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORTS;HAM_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;HAM_ENABLE_REMOTE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"