From: Francesco Chemolli Date: Sun, 5 Jan 2014 21:58:13 +0000 (+0100) Subject: Removed CharacterSet::CRLF and clarified some comments X-Git-Tag: SQUID_3_5_0_1~439^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c86c7b2f839a323ea2c30f73fa5d0204e47867c5;p=thirdparty%2Fsquid.git Removed CharacterSet::CRLF and clarified some comments --- diff --git a/src/base/CharacterSet.cc b/src/base/CharacterSet.cc index db9f31cd24..563dabb9ac 100644 --- a/src/base/CharacterSet.cc +++ b/src/base/CharacterSet.cc @@ -60,7 +60,6 @@ CharacterSet::ALPHA("ALPHA", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWX CharacterSet::BIT("BIT","01"), CharacterSet::CR("CR","\r"), CharacterSet::LF("LF","\n"), -CharacterSet::CRLF("CRLF","\r\n"), CharacterSet::DIGIT("DIGIT","0123456789"), CharacterSet::DQUOTE("DQUOTE","\""), CharacterSet::HTAB("HTAB","\t"), @@ -70,6 +69,7 @@ CharacterSet::VCHAR("VCHAR", 0x21, 0x7e), CharacterSet::WSP("WSP"," \t"), CharacterSet::TCHAR("TCHAR","!#$%&'*+-.^_`|~0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), CharacterSet::SPECIAL("SPECIAL","()<>@,;:\\\"/[]?={}") +// QDTEXT and OBSTEXT are omitted for now as they require c++11 constructors //,CharacterSet::QDTEXT("QDTEXT",{{9,9},{0x20,0x21},{0x23,0x5b},{0x5d,0x7e},{0x80,0xff}}) //,CharacterSet::OBSTEXT("OBSTEXT",0x80,0xff) ; diff --git a/src/base/CharacterSet.h b/src/base/CharacterSet.h index 2d8088ab62..9388003c57 100644 --- a/src/base/CharacterSet.h +++ b/src/base/CharacterSet.h @@ -45,8 +45,6 @@ public: static const CharacterSet CR; // line feed static const CharacterSet LF; - // CRLF - static const CharacterSet CRLF; // double quote static const CharacterSet DQUOTE; // 0-9 @@ -66,9 +64,9 @@ public: static const CharacterSet TCHAR; // special VCHARs static const CharacterSet SPECIAL; - // qdtext (ready but not enabled for now) + // qdtext (ready but not enabled as it requires a c++11 constructor) //static const CharacterSet QDTEXT; - // obs-text + // obs-text (ready but not enabled as it requires a c++11 constructor) //static const CharacterSet OBSTEXT; private: