$NetBSD: patch-aj,v 1.3 2013/04/30 22:20:58 joerg Exp $

--- search.cpp.orig	2000-04-30 09:56:56.000000000 +0000
+++ search.cpp
@@ -4,7 +4,7 @@
 /* Search Functions */
 #define TIME_FLAG 123456
 
-#include <iostream.h>
+#include <iostream>
 #include <stdio.h>
 
 #if DEBUG
@@ -12,7 +12,10 @@
  #include <stdlib.h>
 #endif
 
-#include <fstream.h>
+#include <fstream>
+
+using namespace std;
+
 #include "define.h"
 #include "chess.h"
 #include "const.h"
@@ -24,7 +27,7 @@
 /*----------------------- Search function ---------------------*/
 // Driver for the search process.  1st initialize important data
 // structures, the do iterative deeping until time runs out.
-move search(position p, int time_limit, int T)
+my_move search(position p, int time_limit, int T)
 {
   char outstring[60], mstring[10];
   int g, done, pvi;
@@ -181,7 +184,7 @@ move search(position p, int time_limit, 
   last_depth = 1;
 
   // adjusting hash code for game stage
-  or(p.hcode, stage_code[stage]);
+  hash_or(p.hcode, stage_code[stage]);
 
   // initialize history table
   for(int i = 0; i < 64; i++)
@@ -261,7 +264,7 @@ move search(position p, int time_limit, 
   }
 
   // adjusting hash code for game stage
-  or(p.hcode, stage_code[stage]);
+  hash_or(p.hcode, stage_code[stage]);
 
   if(!xboard && !ALLEG && post) {
    cout << "\nnode_count = " << node_count
@@ -351,7 +354,7 @@ move search(position p, int time_limit, 
 // It is updated by doing a mem-copy of the principle continuation
 // found at deeper depths to this depth + the move at this depth
 // is stuffed in first.
-inline void pc_update(move pcmove, int ply)
+inline void pc_update(my_move pcmove, int ply)
 {
  int pci;
  pc[ply][ply].t = pcmove.t;
@@ -395,7 +398,7 @@ int pvs(int alpha, int beta, int depth, 
  int score, old_depth = depth, mate_ext = 0;
  int mcount = 0, first = 1, razor = 0;
  int razor_margin, total_pieces;
- move smove, gmove, bmove = nomove;
+ my_move smove, gmove, bmove = nomove;
 
 #if DEBUG
 // Debug archiving of search to a file
@@ -423,7 +426,7 @@ outfile << space_string << "->Ply: " << 
  if(ply) {
   // add hash code for this position to position list
   p_list[turn+ply-1] = sp[ply].hcode;
-  or(p_list[turn+ply-1], stage_code[stage]);
+  hash_or(p_list[turn+ply-1], stage_code[stage]);
 
   // fifty move rule
   if(sp[ply].fifty >= 100) return(0);
@@ -470,8 +473,8 @@ outfile << space_string << "->Ply: " << 
    {
      node_count++;
      sp[ply+1] = sp[ply]; sp[ply+1].wtm ^= 1;
-     or(sp[ply+1].hcode,wtm);
-     or(sp[ply+1].hcode,btm);
+     hash_or(sp[ply+1].hcode,wtm);
+     hash_or(sp[ply+1].hcode,btm);
      sp[ply+1].last.t = NOMOVE; sp[ply+1].ep = 0;
      sp[ply+1].material = -sp[ply+1].material;
      sp[ply+1].fifty = 0;
