Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/266-namespaces-part4'

Browse source 
* origin/topic/timw/266-namespaces-part4: (34 commits)
  Add missing namespace to usage of get_exe_path in fuzzer
  Rename methods in RunState to remove 'net' from their names
  Move zeek::net namespace to zeek::run_state namespace.
  Move ScannedFile class and associated globals into ScannedFile.h and out of Net.h and scan.l
  Rename types in ZeekList.h to be consistent with the style guide
  Move NetVar from zeek to zeek::detail namespace
  Remove PRI_PTR_COMPAT macros
  Fix indentation of namespaced aliases
  Move zeek-setup code into namespaces
  Move ZeekList types to zeek namespace
  Move __RegisterBif from zeek::detail::plugin to zeek::plugin::detail
  Remove unimplemented zeek_magic_path/bro_magic_path method
  Move all plugin classes into zeek::plugin::detail namespaces
  Rename BroList.h to ZeekList.h
  Move a few smaller files to zeek namespaces
  Tag the end of some namespaces for consistency
  Move a few of the zeek::util methods and variables to zeek::util::detail
  Move zeekygen code to zeek::zeekygen::detail namespace
  Mark zeek::util::pad_size as constexpr, which provides a small performance improvement
  Move everything in util.h to zeek::util namespace.
  ...
This commit is contained in:
Tim Wojtulewicz 2020-08-21 08:36:48 -07:00
commit 046eb58b75
537 changed files with 9219 additions and 6821 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/file_analysis/FileReassembler.cc
View file

@ -1,11 +1,11 @@
// See the file "COPYING" in the main distribution directory for copyright.
#include "FileReassembler.h"
#include "File.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis);
namespace file_analysis {
class File;
namespace zeek::file_analysis {
FileReassembler::FileReassembler(File *f, uint64_t starting_offset)
: zeek::Reassembler(starting_offset, zeek::REASSEM_FILE), the_file(f), flushing(false)