Commit dad725ad authored by Mark Meredith's avatar Mark Meredith
Browse files

Merge branch 'mwm/fix_win' into 'master' 

Include <array> explicitly for MSVC

See merge request exa/mfix-parser!20
parents 32fd9998 0dacff87

src/csg/impl/csg_types.hpp

+1 −0
Original line number Diff line number Diff line 
#ifndef CSG_TYPES_H_

#define CSG_TYPES_H_



#include <array>

#include <memory>

#include <optional>

#include <tuple>

src/csg/meson.build

+1 −1
Original line number Diff line number Diff line 
lib_csg_parser = library(

lib_csg_parser = static_library(

  'csg-parser',

  'impl/csg.cpp',

  'impl/levelset_3d.cpp',

src/inputs/meson.build

+1 −1
Original line number Diff line number Diff line 
lib_inputs_parser = library(

lib_inputs_parser = static_library(

  'inputs-parser',

  'geometry.cpp',

  'mesh.cpp',