+/*
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
#ifndef SQUID_NOTES_H
#define SQUID_NOTES_H
#include "acl/forward.h"
#include "base/RefCount.h"
-#include "CbDataList.h"
#include "format/Format.h"
-#include "MemPool.h"
+#include "mem/forward.h"
#include "SquidString.h"
-#include "typedefs.h"
#include <string>
#include <vector>
typedef NotesList::const_iterator const_iterator; ///< iterates over the notes list
Notes(const char *aDescr, const char **metasBlacklist, bool allowFormatted = false): descr(aDescr), blacklisted(metasBlacklist), formattedValues(allowFormatted) {}
- Notes(): descr(NULL), blacklisted(NULL) {}
+ Notes(): descr(NULL), blacklisted(NULL), formattedValues(false) {}
~Notes() { notes.clear(); }
/**
* Parse a notes line and returns a pointer to the
*/
class Entry
{
+ MEMPROXY_CLASS(Entry);
public:
Entry(const char *aKey, const char *aValue): name(aKey), value(aValue) {}
String name;
String value;
- MEMPROXY_CLASS(Entry);
};
NotePairs() {}
*/
bool empty() const {return entries.empty();}
- std::vector<NotePairs::Entry *> entries; ///< The key/value pair entries
+ std::vector<NotePairs::Entry *> entries; ///< The key/value pair entries
private:
NotePairs &operator = (NotePairs const &); // Not implemented
NotePairs(NotePairs const &); // Not implemented
};
-MEMPROXY_CLASS_INLINE(NotePairs::Entry);
-
class AccessLogEntry;
/**
* Keep in sync HttpRequest and the corresponding AccessLogEntry objects
*/
void UpdateRequestNotes(ConnStateData *csd, HttpRequest &request, NotePairs const ¬es);
#endif
+