X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=CHANGELOG;h=bdcb67d82e88d2440b1e184aab9b9666ee996f7f;hb=e5324215018e129dd19734acd0e683e5af748423;hp=8794fbc18fee7092c28878b6938de3146b7aa76e;hpb=84123e31b540666d168a28292c0461698841f8be;p=yaz-moved-to-github.git

diff --git a/CHANGELOG b/CHANGELOG
index 8794fbc..bdcb67d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,10 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+Fixes in ASN.1 compiler for C++ compatibility.
+
+* Changed member names "and", "or" and "and_not" in struct Z_Operator
+to "op_and", "op_or" and "op_and_not" to avoid conflict with C++.
+
 Fixed problem with GNU readline detection on Redhat 7.0.
 
 Added step-size for Scan backend handler.