Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make MPark variant public #1522

Merged
merged 1 commit into from
Feb 28, 2022
Merged

Make MPark variant public #1522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sprokit/src/sprokit/pipeline_util/bakery_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <vital/util/token_expander.h>
#include <vital/util/token_type_symtab.h>
#include <vital/logger/logger.h>
#include <vital/internal/variant/variant.hpp>
#include <vital/util/variant/variant.hpp>

#include <map>

Expand Down
2 changes: 1 addition & 1 deletion sprokit/src/sprokit/pipeline_util/pipe_declaration_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <vital/config/config_block.h>
#include <vital/util/source_location.h>
#include <vital/internal/variant/variant.hpp>
#include <vital/util/variant/variant.hpp>

#include <sprokit/pipeline/process.h>

Expand Down
2 changes: 1 addition & 1 deletion vital/types/metadata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include <vital/any.h>
#include <vital/exceptions/metadata.h>
#include <vital/internal/variant/variant.hpp>
#include <vital/util/variant/variant.hpp>
#include <vital/types/geo_point.h>
#include <vital/types/geo_polygon.h>
#include <vital/types/metadata_tags.h>
Expand Down
4 changes: 4 additions & 0 deletions vital/util/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ set( public_headers
token_type_sysenv.h
tokenize.h
transform_image.h
variant/config.hpp
variant/in_place.hpp
variant/lib.hpp
variant/variant.hpp
wrap_text_block.h
file_md5.h
)
Expand Down
0 vital/internal/variant/config.hpp → vital/util/variant/config.hpp
View file
Open in desktop
File renamed without changes.
0 vital/internal/in_place.hpp → vital/util/variant/in_place.hpp
View file
Open in desktop
File renamed without changes.
0 vital/internal/variant/lib.hpp → vital/util/variant/lib.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion vital/internal/variant/variant.hpp → vital/util/variant/variant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ namespace mpark = kwiver::vital;

#include "config.hpp"
#include "lib.hpp"
#include "../in_place.hpp"
#include "in_place.hpp"

namespace kwiver {
namespace vital{
Expand Down
2 changes: 1 addition & 1 deletion vital/util/visit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#define KWIVER_VITAL_UTIL_VISIT_H_

// TODO(C++17): replace with std::variant
#include <vital/internal/variant/variant.hpp>
#include <vital/util/variant/variant.hpp>
#include <vital/vital_config.h>
#include <vital/util/demangle.h>
#include <vital/exceptions.h>
Expand Down