[Shallows-commits] shallows/src Program.cpp,1.30,1.31

[Trond H. <tr...@us...>]

Update of /cvsroot/shallows/shallows/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22799/src

Modified Files:
	Program.cpp 
Log Message:
Fixed min/max compilation error on windows

Index: Program.cpp
===================================================================
RCS file: /cvsroot/shallows/shallows/src/Program.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Program.cpp	19 Jan 2007 13:18:48 -0000	1.30
--- Program.cpp	19 Feb 2007 10:14:36 -0000	1.31
***************
*** 40,44 ****
  
  using namespace shallows::internal;
! 
  namespace shallows {
  
--- 40,47 ----
  
  using namespace shallows::internal;
! #ifdef UNIX
! using std::min;
! using std::max;
! #endif 
  namespace shallows {
  
***************
*** 116,120 ****
  		return std::string();
  		
!     int end = std::min( posFS > posGS ? posFS : programText.length(),
                     		posVS > posGS ? posVS : programText.length() );
  
--- 119,123 ----
  		return std::string();
  		
!     int end = min( posFS > posGS ? posFS : programText.length(),
                     		posVS > posGS ? posVS : programText.length() );
  
***************
*** 132,136 ****
  		return std::string();
  	
!     int end = std::min( posGS > posVS ? posGS : programText.length(),
                     		posFS > posVS ? posFS : programText.length() );
  
--- 135,139 ----
  		return std::string();
  	
!     int end = min( posGS > posVS ? posGS : programText.length(),
                     		posFS > posVS ? posFS : programText.length() );
  
***************
*** 148,152 ****
  		return std::string();
  		
!     int end = std::min( posVS > posFS ? posVS : programText.length(),
                     		posGS > posFS ? posGS : programText.length() );
  
--- 151,155 ----
  		return std::string();
  		
!     int end = min( posVS > posFS ? posVS : programText.length(),
                     		posGS > posFS ? posGS : programText.length() );