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

[<as...@us...>]

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

Modified Files:
	php_var.cpp 
Log Message:
Fixed a commited conflict.


Index: php_var.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/php_var.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** php_var.cpp	5 Aug 2003 01:26:57 -0000	1.22
--- php_var.cpp	5 Aug 2003 02:23:20 -0000	1.23
***************
*** 435,445 ****
  	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)
- {
- 	return (php_var)((int) l + (int) r);
- }
  php_var operator-(php_var l, php_var r)
  {
--- 435,438 ----
***************
*** 447,449 ****
  }
  #define is_identical(var, varb) (((var) == (varb) && (var).type == (varb).type) ? (php_var)true : (php_var)false)
- >>>>>>> 1.21
--- 440,441 ----