Skip to content

[vcpkg] Fix forward declarations and missing pragma once #12836

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

Closed
cngzhnp wants to merge 1 commit into from
Closed

[vcpkg] Fix forward declarations and missing pragma once #12836

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
5 changes: 4 additions & 1 deletion toolsrc/include/vcpkg/archives.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

#include <vcpkg/base/files.h>

#include <vcpkg/vcpkgpaths.h>
namespace vcpkg
{
struct VcpkgPaths;
}

namespace vcpkg::Archives
{
Expand Down
6 changes: 4 additions & 2 deletions toolsrc/include/vcpkg/buildenvironment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
#include <vcpkg/base/system.process.h>
#pragma once

#include <vcpkg/vcpkgpaths.h>
#include <vcpkg/base/system.process.h>

#include <string>
#include <vector>

namespace vcpkg
{
struct VcpkgPaths;

std::string make_cmake_cmd(const VcpkgPaths& paths,
const fs::path& cmake_script,
std::vector<System::CMakeVariable>&& pass_variables);
Expand Down
6 changes: 5 additions & 1 deletion toolsrc/include/vcpkg/cmakevars.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
#include <vcpkg/base/optional.h>

#include <vcpkg/portfileprovider.h>
#include <vcpkg/vcpkgpaths.h>

namespace vcpkg::Dependencies
{
struct ActionPlan;
}

namespace vcpkg
{
struct VcpkgPaths;
}

namespace vcpkg::CMakeVars
{
struct CMakeVarProvider
Expand Down
1 change: 1 addition & 0 deletions toolsrc/include/vcpkg/commands.contact.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <vcpkg/commands.interface.h>
#include <vcpkg/vcpkgcmdarguments.h>

namespace vcpkg::Commands::Contact
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/include/vcpkg/commands.create.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <vcpkg/commands.interface.h>
#include <vcpkg/vcpkgcmdarguments.h>

namespace vcpkg::Commands::Create
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/include/vcpkg/commands.dependinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <vcpkg/commands.interface.h>
#include <vcpkg/vcpkgcmdarguments.h>

namespace vcpkg::Commands::DependInfo
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/include/vcpkg/commands.edit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <vcpkg/commands.interface.h>
#include <vcpkg/vcpkgcmdarguments.h>

namespace vcpkg::Commands::Edit
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/include/vcpkg/commands.format-manifest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <vcpkg/commands.interface.h>
#include <vcpkg/vcpkgcmdarguments.h>

namespace vcpkg::Commands::FormatManifest
{
Expand Down
11 changes: 4 additions & 7 deletions toolsrc/include/vcpkg/commands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
#pragma once

#include <vcpkg/build.h>
#include <vcpkg/commands.interface.h>
#include <vcpkg/dependencies.h>
#include <vcpkg/statusparagraphs.h>

#include <array>
#include <map>
#include <vector>

namespace vcpkg::Commands
{
struct BasicCommand;
struct PathsCommand;
struct TripletCommand;

template<class T>
struct PackageNameAndFunction
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/include/vcpkg/commands.info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <vcpkg/commands.interface.h>
#include <vcpkg/vcpkgcmdarguments.h>

namespace vcpkg::Commands::Info
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/include/vcpkg/commands.integrate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <vcpkg/commands.interface.h>
#include <vcpkg/vcpkgcmdarguments.h>

namespace vcpkg::Commands::Integrate
{
Expand Down
13 changes: 11 additions & 2 deletions toolsrc/include/vcpkg/commands.interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
#pragma once

#include <vcpkg/vcpkgcmdarguments.h>
#include <vcpkg/vcpkgpaths.h>
#include <vcpkg/triplet.h>

namespace vcpkg
{
struct VcpkgCmdArguments;
struct VcpkgPaths;
namespace Files
{
struct Filesystem;
}
}

namespace vcpkg::Commands
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/include/vcpkg/commands.list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <vcpkg/commands.interface.h>
#include <vcpkg/vcpkgcmdarguments.h>

namespace vcpkg::Commands::List
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/include/vcpkg/commands.owns.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <vcpkg/commands.interface.h>
#include <vcpkg/vcpkgcmdarguments.h>

namespace vcpkg::Commands::Owns
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/include/vcpkg/commands.search.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <vcpkg/commands.interface.h>
#include <vcpkg/vcpkgcmdarguments.h>

namespace vcpkg::Commands::Search
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/include/vcpkg/commands.setinstalled.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <vcpkg/cmakevars.h>
#include <vcpkg/commands.interface.h>
#include <vcpkg/portfileprovider.h>
#include <vcpkg/vcpkgcmdarguments.h>

namespace vcpkg::Commands::SetInstalled
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/include/vcpkg/commands.upgrade.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <vcpkg/commands.interface.h>
#include <vcpkg/vcpkgcmdarguments.h>

namespace vcpkg::Commands::Upgrade
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/include/vcpkg/commands.xvsinstances.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <vcpkg/commands.interface.h>
#include <vcpkg/vcpkgcmdarguments.h>

namespace vcpkg::Commands::X_VSInstances
{
Expand Down
19 changes: 15 additions & 4 deletions toolsrc/include/vcpkg/dependencies.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
#include <vcpkg/base/util.h>

#include <vcpkg/build.h>
#include <vcpkg/cmakevars.h>
#include <vcpkg/packagespec.h>
#include <vcpkg/portfileprovider.h>
#include <vcpkg/statusparagraphs.h>
#include <vcpkg/vcpkgpaths.h>

#include <functional>
#include <map>
Expand All @@ -19,6 +15,21 @@ namespace vcpkg::Graphs
struct Randomizer;
}

namespace vcpkg::CMakeVars
{
struct CMakeVarProvider;
}

namespace vcpkg::PortFileProvider
{
struct PortFileProvider;
}

namespace vcpkg
{
struct StatusParagraphs;
}

namespace vcpkg::Dependencies
{
enum class RequestType
Expand Down
6 changes: 5 additions & 1 deletion toolsrc/include/vcpkg/export.ifw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
#pragma once

#include <vcpkg/dependencies.h>
#include <vcpkg/vcpkgpaths.h>

#include <string>
#include <vector>

namespace vcpkg
{
struct VcpkgPaths;
}

namespace vcpkg::Export::IFW
{
struct Options
Expand Down
1 change: 1 addition & 0 deletions toolsrc/include/vcpkg/help.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <vcpkg/commands.interface.h>
#include <vcpkg/vcpkgcmdarguments.h>

#include <string>

Expand Down
1 change: 1 addition & 0 deletions toolsrc/src/vcpkg/archives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <vcpkg/archives.h>
#include <vcpkg/commands.h>
#include <vcpkg/tools.h>
#include <vcpkg/vcpkgpaths.h>

namespace vcpkg::Archives
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/src/vcpkg/buildenvironment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <vcpkg/buildenvironment.h>
#include <vcpkg/tools.h>
#include <vcpkg/vcpkgpaths.h>

namespace vcpkg
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/src/vcpkg/commands.ciclean.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <vcpkg/commands.ciclean.h>
#include <vcpkg/vcpkgcmdarguments.h>
#include <vcpkg/vcpkgpaths.h>

using namespace vcpkg;

Expand Down
1 change: 1 addition & 0 deletions toolsrc/src/vcpkg/commands.contact.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <vcpkg/base/chrono.h>
#include <vcpkg/base/system.print.h>
#include <vcpkg/base/system.process.h>
#include <vcpkg/base/util.h>

#include <vcpkg/commands.contact.h>
#include <vcpkg/help.h>
Expand Down
2 changes: 2 additions & 0 deletions toolsrc/src/vcpkg/commands.create.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#include <vcpkg/base/checks.h>
#include <vcpkg/base/files.h>
#include <vcpkg/base/util.h>

#include <vcpkg/buildenvironment.h>
#include <vcpkg/commands.create.h>
#include <vcpkg/help.h>
#include <vcpkg/vcpkgpaths.h>

namespace vcpkg::Commands::Create
{
Expand Down
2 changes: 2 additions & 0 deletions toolsrc/src/vcpkg/commands.fetch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include <vcpkg/base/system.print.h>

#include <vcpkg/commands.fetch.h>
#include <vcpkg/vcpkgcmdarguments.h>
#include <vcpkg/vcpkgpaths.h>

namespace vcpkg::Commands::Fetch
{
Expand Down
3 changes: 3 additions & 0 deletions toolsrc/src/vcpkg/commands.hash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
#include <vcpkg/base/hash.h>
#include <vcpkg/base/system.print.h>
#include <vcpkg/base/util.h>

#include <vcpkg/commands.hash.h>
#include <vcpkg/vcpkgcmdarguments.h>
#include <vcpkg/vcpkgpaths.h>

namespace vcpkg::Commands::Hash
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/src/vcpkg/commands.integrate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <vcpkg/metrics.h>
#include <vcpkg/tools.h>
#include <vcpkg/userconfig.h>
#include <vcpkg/vcpkgpaths.h>

namespace vcpkg::Commands::Integrate
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/src/vcpkg/commands.porthistory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <vcpkg/commands.porthistory.h>
#include <vcpkg/help.h>
#include <vcpkg/tools.h>
#include <vcpkg/vcpkgpaths.h>

namespace vcpkg::Commands::PortHistory
{
Expand Down
1 change: 1 addition & 0 deletions toolsrc/src/vcpkg/commands.version.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <vcpkg/commands.version.h>
#include <vcpkg/help.h>
#include <vcpkg/metrics.h>
#include <vcpkg/vcpkgpaths.h>

#define STRINGIFY(...) #__VA_ARGS__
#define MACRO_TO_STRING(X) STRINGIFY(X)
Expand Down
2 changes: 1 addition & 1 deletion toolsrc/src/vcpkg/commands.xvsinstances.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace vcpkg::Commands::X_VSInstances

Checks::exit_success(VCPKG_LINE_INFO);
#else
Util::unused(args, paths);
(void)(args, paths);
Copy link
Member

@BillyONeal BillyONeal Aug 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice to see complete elimination of Util::unused but that's a separate change.

Copy link
Contributor Author

@cngzhnp cngzhnp Aug 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was requested from @strega-nil. Not related with context but added.

Copy link
Member

@BillyONeal BillyONeal Aug 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I mean do what she asked but for all callers of Util::unused rather than just here.

Checks::exit_with_message(VCPKG_LINE_INFO, "This command is not supported on non-windows platforms.");
#endif
}
Expand Down