Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 23:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move ODesc to zeek namespace

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-22 09:46:46 -07:00
parent fdcb2760b2
commit 4e9a5e9d98
53 changed files with 162 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Obj.h
View file

@ -2,9 +2,11 @@
#pragma once
#include "zeek-config.h"
#include <limits.h>
class ODesc;
ZEEK_FORWARD_DECLARE_NAMESPACED(ODesc, zeek);
namespace zeek {
namespace detail {
@ -19,7 +21,7 @@ public:
Location() = default;
void Describe(ODesc* d) const;
void Describe(zeek::ODesc* d) const;
bool operator==(const Location& l) const;
bool operator!=(const Location& l) const
@ -103,9 +105,9 @@ public:
[[noreturn]] void Internal(const char* msg) const;
void InternalWarning(const char* msg) const;
virtual void Describe(ODesc* d) const { /* FIXME: Add code */ };
virtual void Describe(zeek::ODesc* d) const { /* FIXME: Add code */ };
void AddLocation(ODesc* d) const;
void AddLocation(zeek::ODesc* d) const;
// Get location info for debugging.
const detail::Location* GetLocationInfo() const
@ -142,10 +144,10 @@ protected:
private:
friend class SuppressErrors;
void DoMsg(ODesc* d, const char s1[], const Obj* obj2 = nullptr,
bool pinpoint_only = false, const detail::Location* expr_location = nullptr) const;
void PinPoint(ODesc* d, const Obj* obj2 = nullptr,
bool pinpoint_only = false) const;
void DoMsg(zeek::ODesc* d, const char s1[], const Obj* obj2 = nullptr,
bool pinpoint_only = false, const detail::Location* expr_location = nullptr) const;
void PinPoint(zeek::ODesc* d, const Obj* obj2 = nullptr,
bool pinpoint_only = false) const;
friend inline void Ref(Obj* o);
friend inline void Unref(Obj* o);