# 
# 
# patch "ChangeLog"
#  from [659e723a39e7dd50e5b7349f3b15c44d8a8a60fa]
#    to [311eeb3a361d369eaa75b0bc469da3939a92111d]
# 
# patch "vocab_macros.hh"
#  from [748ccefd0d3c1b09bd0a271f92b25279526f5063]
#    to [c80d10b6ae90fb581c2e86cb989a3262b566cabc]
# 
============================================================
--- ChangeLog	659e723a39e7dd50e5b7349f3b15c44d8a8a60fa
+++ ChangeLog	311eeb3a361d369eaa75b0bc469da3939a92111d
@@ -1,3 +1,7 @@
+2007-02-07  Lapo Luchini  <address@hidden>
+
+	* vocab_macros.hh: changed operator!=() to actually use inner ==.
+
 2007-02-07  Daniel Carosone  <address@hidden>
 
 	* tests/db_kill_rev_and_recommit/__driver__.lua/: add a test
@@ -66,6 +70,10 @@ 2007-02-07  Derek Scherger  <address@hidden
 	simulated_working_tree to see if update will fail on something
 	obvious
 
+2007-02-07  Lapo Luchini  <address@hidden>
+
+	* vocab_macros.hh: added some missing operator!=().
+
 2007-02-07  Matthew Gregan  <address@hidden>
 
 	* win32/os_strerror.c (os_strerror): Clean up string handling.
============================================================
--- vocab_macros.hh	748ccefd0d3c1b09bd0a271f92b25279526f5063
+++ vocab_macros.hh	c80d10b6ae90fb581c2e86cb989a3262b566cabc
@@ -31,7 +31,7 @@ public:                                 
   bool operator==(enc<INNER> const & x) const          \
     { return i() == x(); }                             \
   bool operator!=(enc<INNER> const & x) const          \
-    { return i() != x(); }                             \
+    { return !(i() == x()); }                          \
   friend std::ostream & operator<< <>(std::ostream &,  \
                                  enc<INNER> const &);  \
 };
@@ -67,7 +67,7 @@ public:                                 
   bool operator==(dec<INNER> const & x) const          \
     { return i == x.i; }                               \
   bool operator!=(dec<INNER> const & x) const          \
-    { return i != x.i; }                               \
+    { return !(i == x.i); }                            \
   friend std::ostream & operator<< <>(std::ostream &,  \
                                  dec<INNER> const &);  \
 };