From 8a8a942886c28b70587eb0c6c4e25bb873660a32 Mon Sep 17 00:00:00 2001 From: "Marroquin, Asgard" Date: Fri, 18 Sep 2020 16:24:36 -0700 Subject: [PATCH 1/2] Squashed 'opae-libs/' changes from ada8bd1..4609453 4609453 Add CACHE, DOCSTRING to submodule branch targets (#89) 5c86414 Update version for `release/2.0.0` branch (#88) 713e81e Change TAG var definition from OPTION to SET 51363af Change targets from master to release/2.0.0 REVERT: ada8bd1 Merge pull request #85 from OPAE/aravuri/fix_subrepo REVERT: 6c85e53 opae-libs: update cmaklist tag to release branch REVERT: 38c747d Merge pull request #84 from OPAE/aravuri/fix_ver REVERT: 7e40e35 opae-sdk: update opae release version to 2.0 REVERT: 2fa56e6 opae-cxx: fix coding style (#83) REVERT: 60b2ade opae-cxx: fix issue found by checker (#82) git-subtree-dir: opae-libs git-subtree-split: 46094539bea60e80b21a3309f27807ebf51ae76b --- CMakeLists.txt | 4 ++-- include/opae/cxx/core/pvalue.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 240ba290b695..74ade76f9aa8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,12 +102,12 @@ option(OPAE_PRESERVE_REPOS "Disable refresh of external repos" OFF) mark_as_advanced(OPAE_PRESERVE_REPOS) if(OPAE_BUILD_TESTS) - option(OPAE_TEST_TAG "Desired branch for opae-test" release/2.0.0) + set(OPAE_TEST_TAG "release/2.0.0" CACHE STRING "Desired branch for opae-test") mark_as_advanced(OPAE_TEST_TAG) endif(OPAE_BUILD_TESTS) if(OPAE_BUILD_SIM) - option(OPAE_SIM_TAG "Desired branch for opae-sim" release/2.0.0) + set(OPAE_SIM_TAG "release/2.0.0" CACHE STRING "Desired branch for opae-sim") mark_as_advanced(OPAE_SIM_TAG) endif(OPAE_BUILD_SIM) diff --git a/include/opae/cxx/core/pvalue.h b/include/opae/cxx/core/pvalue.h index 2a0319e8e157..81f2155b1c0b 100644 --- a/include/opae/cxx/core/pvalue.h +++ b/include/opae/cxx/core/pvalue.h @@ -164,7 +164,7 @@ struct pvalue { typedef typename std::conditional::value, typename std::string, T>::type copy_t; - pvalue() : props_(0), is_set_(false), get_(nullptr), set_(nullptr), copy_() {} + pvalue() : props_(0), is_set_(false), get_(nullptr), set_(nullptr) {} /** * @brief pvalue contructor that takes in a reference to fpga_properties @@ -175,7 +175,7 @@ struct pvalue { * @param s The setter function */ pvalue(fpga_properties *p, getter_t g, setter_t s) - : props_(p), is_set_(false), get_(g), set_(s), copy_() {} + : props_(p), is_set_(false), get_(g), set_(s) {} /** * @brief Overload of `=` operator that calls the wrapped setter From 2ac94b0dc443a592979f7525659ed67e612ad747 Mon Sep 17 00:00:00 2001 From: "Marroquin, Asgard" Date: Fri, 18 Sep 2020 16:30:08 -0700 Subject: [PATCH 2/2] Use `set` for defining legacy branch target `OPTION` only works with boolean arguments. Use `SET` instead for allowing string input instead. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5e97f7f4c55..e510c3d2dfb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ option(OPAE_BUILD_LEGACY "Enable building of OPAE legacy tools" OFF) mark_as_advanced(OPAE_BUILD_LEGACY) if(OPAE_BUILD_LEGACY) - option(OPAE_LEGACY_TAG "Desired branch for opae-legacy" master) + set(OPAE_LEGACY_TAG "release/2.0.0" CACHE STRING "Desired branch for opae-legacy") mark_as_advanced(OPAE_LEGACY_TAG) endif(OPAE_BUILD_LEGACY)