Index: src/parseinfo.cpp
===================================================================
RCS file: /usr/local/cvs/cvsnt/src/parseinfo.c,v
retrieving revision 1.22.2.31.6.8.2.6
diff -c -r1.22.2.31.6.8.2.6 parseinfo.cpp
*** src/parseinfo.cpp	26 Aug 2024 23:24:39 -0000	1.22.2.31.6.8.2.6
--- src/parseinfo.cpp	3 Oct 2024 01:05:52 -0000
***************
*** 116,124 ****
  				global_real_session_time,remote_host_name?remote_host_name:hostname,
  				CVS_Username,current_parsed_root->unparsed_directory,
  				current_parsed_root->directory,global_session_id,Editor,
! #if defined _WIN32 && _MSC_VER < 1900 /* 1900 == VS2015 has std::addressof() ? */
  					count_uservar, (count_uservar>0)?&uservar[0]:NULL, (count_uservar>0)?&userval[0]:NULL, cv, codep, verify_admin()))
  #else
  					count_uservar, (count_uservar>0)?std::addressof(*uservarit):NULL, (count_uservar>0)?std::addressof(*uservalit):NULL, cv, codep, verify_admin()))
  #endif 
  			{
--- 116,125 ----
  				global_real_session_time,remote_host_name?remote_host_name:hostname,
  				CVS_Username,current_parsed_root->unparsed_directory,
  				current_parsed_root->directory,global_session_id,Editor,
! #if (defined(_WIN32) && _MSC_VER < 1900) || (!defined(_WIN32))
  					count_uservar, (count_uservar>0)?&uservar[0]:NULL, (count_uservar>0)?&userval[0]:NULL, cv, codep, verify_admin()))
  #else
+ 					/* 1900 == VS2015 has std::addressof() ? */
  					count_uservar, (count_uservar>0)?std::addressof(*uservarit):NULL, (count_uservar>0)?std::addressof(*uservalit):NULL, cv, codep, verify_admin()))
  #endif 
  			{