mirror of
https://github.com/jbeder/yaml-cpp.git
synced 2025-09-09 12:41:17 +00:00
Compare commits
1 Commits
master
...
dependabot
Author | SHA1 | Date | |
---|---|---|---|
![]() |
1599d55a3d |
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@@ -50,7 +50,7 @@ jobs:
|
||||
packages: googletest libgmock-dev libgtest-dev
|
||||
version: 1.0
|
||||
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v5
|
||||
|
||||
- name: Configure
|
||||
run: |
|
||||
@@ -108,7 +108,7 @@ jobs:
|
||||
os: [ubuntu-latest, windows-latest, macos-latest]
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v5
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
@@ -126,7 +126,7 @@ jobs:
|
||||
os: [ubuntu-latest, windows-latest, macos-latest]
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v5
|
||||
|
||||
- name: Build
|
||||
shell: bash
|
||||
|
2
.github/workflows/bzlmod-archive.yml
vendored
2
.github/workflows/bzlmod-archive.yml
vendored
@@ -12,7 +12,7 @@ jobs:
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.1.1
|
||||
- run: git archive $GITHUB_REF -o "yaml-cpp-${GITHUB_REF:10}.tar.gz"
|
||||
- run: gh release upload ${GITHUB_REF:10} "yaml-cpp-${GITHUB_REF:10}.tar.gz"
|
||||
env:
|
||||
|
@@ -25,7 +25,6 @@ class YAML_CPP_API memory {
|
||||
memory() : m_nodes{} {}
|
||||
node& create_node();
|
||||
void merge(const memory& rhs);
|
||||
size_t size() const;
|
||||
|
||||
private:
|
||||
using Nodes = std::set<shared_node>;
|
||||
|
@@ -9,10 +9,6 @@ void memory_holder::merge(memory_holder& rhs) {
|
||||
if (m_pMemory == rhs.m_pMemory)
|
||||
return;
|
||||
|
||||
if (m_pMemory->size() < rhs.m_pMemory->size()) {
|
||||
std::swap(m_pMemory, rhs.m_pMemory);
|
||||
}
|
||||
|
||||
m_pMemory->merge(*rhs.m_pMemory);
|
||||
rhs.m_pMemory = m_pMemory;
|
||||
}
|
||||
@@ -26,9 +22,5 @@ node& memory::create_node() {
|
||||
void memory::merge(const memory& rhs) {
|
||||
m_nodes.insert(rhs.m_nodes.begin(), rhs.m_nodes.end());
|
||||
}
|
||||
|
||||
size_t memory::size() const {
|
||||
return m_nodes.size();
|
||||
}
|
||||
} // namespace detail
|
||||
} // namespace YAML
|
||||
|
Reference in New Issue
Block a user