[binaryphp-cvs] binaryphp php_var.cpp,1.21,1.22

[<rha...@us...>]

Update of /cvsroot/binaryphp/binaryphp
In directory sc8-pr-cvs1:/tmp/cvs-serv30305

Modified Files:
	php_var.cpp 
Log Message:


Index: php_var.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/php_var.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** php_var.cpp	4 Aug 2003 23:46:24 -0000	1.21
--- php_var.cpp	5 Aug 2003 01:26:57 -0000	1.22
***************
*** 3,6 ****
--- 3,7 ----
  #include <vector>
  #include <stdio.h>
+ #include <iostream>
  #define PHP_NULL 0
  #define PHP_STRING 1
***************
*** 424,427 ****
--- 425,429 ----
  	else
  		out << var.container;
+ 	return out;
  }
  bool operator<(int i,php_var v)
***************
*** 433,436 ****
--- 435,441 ----
  	return(v < i);
  }
+ <<<<<<< php_var.cpp
+ #define is_identical(var, varb) (((var) == (varb) && (var).type == (varb).type) ? (php_var)true : (php_var)false)
+ =======
  php_var operator+(php_var l, php_var r)
  {
***************
*** 442,443 ****
--- 447,449 ----
  }
  #define is_identical(var, varb) (((var) == (varb) && (var).type == (varb).type) ? (php_var)true : (php_var)false)
+ >>>>>>> 1.21