max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed ifdefs for linux

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7985 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2013-08-28 22:00:41 +00:00
parent 3d8d0158ce
commit b97a6552a3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unit/TestIPhreeqc.cpp
View File

@ -3618,10 +3618,10 @@ void TestIPhreeqc::TestMultiPunchSelectedOutputStringOn(void)
CPPUNIT_ASSERT( ::strstr(obj.GetSelectedOutputStringLine(8), "Dummy2\t") != NULL ); CPPUNIT_ASSERT( ::strstr(obj.GetSelectedOutputStringLine(8), "Dummy2\t") != NULL );
} }
//#if 0 #if 0
#include <windows.h> #include <windows.h>
#include "Debug.h" #include "Debug.h"
//#endif #endif
void TestIPhreeqc::TestMultiPunchCSelectedOutput(void) void TestIPhreeqc::TestMultiPunchCSelectedOutput(void)
{ {
@ -3634,7 +3634,7 @@ void TestIPhreeqc::TestMultiPunchCSelectedOutput(void)
CPPUNIT_ASSERT_EQUAL(6, obj.GetSelectedOutputRowCount()); CPPUNIT_ASSERT_EQUAL(6, obj.GetSelectedOutputRowCount());
CPPUNIT_ASSERT_EQUAL(35, obj.GetSelectedOutputColumnCount()); CPPUNIT_ASSERT_EQUAL(35, obj.GetSelectedOutputColumnCount());
//#if 0 #if 0
char buffer[80]; char buffer[80];
for (int r = 0; r < obj.GetSelectedOutputRowCount(); ++r) for (int r = 0; r < obj.GetSelectedOutputRowCount(); ++r)
{ {
@ -3663,7 +3663,7 @@ void TestIPhreeqc::TestMultiPunchCSelectedOutput(void)
} }
::OutputDebugString("\n"); ::OutputDebugString("\n");
} }
//#endif #endif
// headings // headings
@ -3743,7 +3743,7 @@ void TestIPhreeqc::TestMultiPunchCSelectedOutput(void)
CPPUNIT_ASSERT_EQUAL(7, obj.GetSelectedOutputRowCount()); CPPUNIT_ASSERT_EQUAL(7, obj.GetSelectedOutputRowCount());
CPPUNIT_ASSERT_EQUAL(16, obj.GetSelectedOutputColumnCount()); CPPUNIT_ASSERT_EQUAL(16, obj.GetSelectedOutputColumnCount());
//#if 0 #if 0
for (int r = 0; r < obj.GetSelectedOutputRowCount(); ++r) for (int r = 0; r < obj.GetSelectedOutputRowCount(); ++r)
{ {
for (int c = 0; c < obj.GetSelectedOutputColumnCount(); ++c) for (int c = 0; c < obj.GetSelectedOutputColumnCount(); ++c)
@ -3771,7 +3771,7 @@ void TestIPhreeqc::TestMultiPunchCSelectedOutput(void)
} }
::OutputDebugString("\n"); ::OutputDebugString("\n");
} }
//#endif #endif
// COMMENT: {8/26/2013 11:32:00 PM} CPPUNIT_ASSERT( ::strstr(obj.GetSelectedOutputStringLine(0), "si_Halite\t") != NULL ); // COMMENT: {8/26/2013 11:32:00 PM} CPPUNIT_ASSERT( ::strstr(obj.GetSelectedOutputStringLine(0), "si_Halite\t") != NULL );
// COMMENT: {8/26/2013 11:32:00 PM} CPPUNIT_ASSERT( ::strstr(obj.GetSelectedOutputStringLine(0), "si_Calcite\t") != NULL ); // COMMENT: {8/26/2013 11:32:00 PM} CPPUNIT_ASSERT( ::strstr(obj.GetSelectedOutputStringLine(0), "si_Calcite\t") != NULL );