tree: make ctors noexcept. fix warnings.

biojppm · Jun 10, 2019 · a0e27a6 · a0e27a6
1 parent a9943ae
commit a0e27a6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/extern/c4core b/extern/c4core
diff --git a/src/c4/yml/tree.cpp b/src/c4/yml/tree.cpp
@@ -97,24 +97,24 @@ Tree::~Tree()
 }
 
 
-Tree::Tree(Tree const& that) : Tree()
+Tree::Tree(Tree const& that) noexcept : Tree()
 {
     _copy(that);
 }
 
-Tree& Tree::operator= (Tree const& that)
+Tree& Tree::operator= (Tree const& that) noexcept
 {
     _free();
     _copy(that);
     return *this;
 }
 
-Tree::Tree(Tree && that) : Tree()
+Tree::Tree(Tree && that) noexcept : Tree()
 {
     _move(that);
 }
 
-Tree& Tree::operator= (Tree && that)
+Tree& Tree::operator= (Tree && that) noexcept
 {
     _free();
     _move(that);

diff --git a/src/c4/yml/tree.hpp b/src/c4/yml/tree.hpp
@@ -342,11 +342,11 @@ class Tree
 
     ~Tree();
 
-    Tree(Tree const& that);
-    Tree(Tree     && that);
+    Tree(Tree const& that) noexcept;
+    Tree(Tree     && that) noexcept;
 
-    Tree& operator= (Tree const& that);
-    Tree& operator= (Tree     && that);
+    Tree& operator= (Tree const& that) noexcept;
+    Tree& operator= (Tree     && that) noexcept;
 
 public:
 

diff --git a/test/libyaml.hpp b/test/libyaml.hpp
@@ -343,7 +343,7 @@ case YAML_ ## _ev ## _EVENT:                            \
         }
         if(loc2 && *loc2)
         {
-            fprintf(stderr, "    : %s at %zd:%zd (offset %zd)\n", loc2->name, loc1->line, loc2->col, loc2->offset);
+            fprintf(stderr, "    : %s at %zd:%zd (offset %zd)\n", loc2->name, loc2->line, loc2->col, loc2->offset);
         }
         throw std::runtime_error(std::string(msg, msg+length));
     }

diff --git a/test/test_case.hpp b/test/test_case.hpp
@@ -93,11 +93,11 @@ struct CaseNode
 
 public:
 
-    CaseNode(CaseNode     && that) { _move(std::move(that)); }
-    CaseNode(CaseNode const& that) { _copy(that); }
+    CaseNode(CaseNode     && that) noexcept { _move(std::move(that)); }
+    CaseNode(CaseNode const& that) noexcept { _copy(that); }
 
-    CaseNode& operator= (CaseNode     && that) { _move(std::move(that)); return *this; }
-    CaseNode& operator= (CaseNode const& that) { _copy(that); return *this; }
+    CaseNode& operator= (CaseNode     && that) noexcept { _move(std::move(that)); return *this; }
+    CaseNode& operator= (CaseNode const& that) noexcept { _copy(that); return *this; }
 
     ~CaseNode() = default;