Minor updates

p-ranav · p-ranav · commit 1cd8d6f31266 · 2020-03-21T15:47:10.000-05:00
diff --git a/include/cppgit2/diff.hpp b/include/cppgit2/diff.hpp
@@ -7,11 +7,11 @@
 #include <cppgit2/ownership.hpp>
 #include <cppgit2/signature.hpp>
 #include <cppgit2/strarray.hpp>
+#include <functional>
 #include <git2.h>
 #include <string>
 #include <utility>
 #include <vector>
-#include <functional>
 
 namespace cppgit2 {
 
diff --git a/include/cppgit2/indexer.hpp b/include/cppgit2/indexer.hpp
@@ -3,8 +3,8 @@
 #include <cppgit2/odb.hpp>
 #include <cppgit2/oid.hpp>
 #include <cppgit2/ownership.hpp>
-#include <git2.h>
 #include <functional>
+#include <git2.h>
 
 namespace cppgit2 {
 
diff --git a/include/cppgit2/libgit2_api.hpp b/include/cppgit2/libgit2_api.hpp
@@ -17,7 +17,7 @@ class libgit2_api {
     int major, minor, revision;
     if (git_libgit2_version(&major, &minor, &revision))
       throw git_exception();
-    return {major, minor, revision};
+    return std::tuple<int, int, int>{major, minor, revision};
   }
 };
 
diff --git a/include/cppgit2/odb.hpp b/include/cppgit2/odb.hpp
@@ -5,11 +5,11 @@
 #include <cppgit2/object.hpp>
 #include <cppgit2/oid.hpp>
 #include <cppgit2/ownership.hpp>
+#include <functional>
 #include <git2.h>
 #include <tuple>
 #include <utility>
 #include <vector>
-#include <functional>
 
 namespace cppgit2 {
 
diff --git a/include/cppgit2/patch.hpp b/include/cppgit2/patch.hpp
@@ -3,10 +3,10 @@
 #include <cppgit2/diff.hpp>
 #include <cppgit2/libgit2_api.hpp>
 #include <cppgit2/ownership.hpp>
+#include <functional>
 #include <git2.h>
 #include <string>
 #include <tuple>
-#include <functional>
 
 namespace cppgit2 {
 
diff --git a/include/cppgit2/remote.hpp b/include/cppgit2/remote.hpp
@@ -149,8 +149,9 @@ class remote : public libgit2_api {
                 const fetch::options &options = fetch::options());
 
   // Download new data and update tips
-  void fetch_data(const strarray &refspecs, const std::string &reflog_message,
-             const cppgit2::fetch::options &options = cppgit2::fetch::options());
+  void fetch_data(
+      const strarray &refspecs, const std::string &reflog_message,
+      const cppgit2::fetch::options &options = cppgit2::fetch::options());
 
   // Get the remote's list of fetch refspecs
   // The memory is owned by the user and should be freed
diff --git a/include/cppgit2/repository.hpp b/include/cppgit2/repository.hpp
@@ -37,10 +37,10 @@
 #include <cppgit2/tag.hpp>
 #include <cppgit2/tree_builder.hpp>
 #include <cppgit2/worktree.hpp>
+#include <functional>
 #include <git2.h>
 #include <string>
 #include <utility>
-#include <functional>
 
 namespace cppgit2 {
 
diff --git a/include/cppgit2/revwalk.hpp b/include/cppgit2/revwalk.hpp
@@ -3,8 +3,8 @@
 #include <cppgit2/libgit2_api.hpp>
 #include <cppgit2/oid.hpp>
 #include <cppgit2/ownership.hpp>
-#include <git2.h>
 #include <functional>
+#include <git2.h>
 
 namespace cppgit2 {
 
diff --git a/include/cppgit2/tree_builder.hpp b/include/cppgit2/tree_builder.hpp
@@ -8,7 +8,6 @@
 #include <functional>
 #include <git2.h>
 #include <string>
-#include <functional>
 
 namespace cppgit2 {
 
diff --git a/src/odb.cpp b/src/odb.cpp
@@ -132,8 +132,8 @@ odb::read_header(const oid &id) const {
   git_object_t object_type_out;
   if (git_odb_read_header(&length_out, &object_type_out, c_ptr_, id.c_ptr()))
     throw git_exception();
-  return {length_out,
-          static_cast<cppgit2::object::object_type>(object_type_out)};
+  return std::pair<size_t, cppgit2::object::object_type>{
+      length_out, static_cast<cppgit2::object::object_type>(object_type_out)};
 }
 
 odb::object odb::read_prefix(const oid &id, size_t length) const {
@@ -164,7 +164,8 @@ odb::open_rstream(const oid &id) {
   git_object_t type;
   if (git_odb_open_rstream(&result.c_ptr_, &length, &type, c_ptr_, id.c_ptr()))
     throw git_exception();
-  return {result, length, static_cast<cppgit2::object::object_type>(type)};
+  return std::tuple<odb::stream, size_t, cppgit2::object::object_type>{
+      result, length, static_cast<cppgit2::object::object_type>(type)};
 }
 
 odb::stream odb::open_wstream(cppgit2::object::object_size size,
diff --git a/src/patch.cpp b/src/patch.cpp
@@ -59,7 +59,7 @@ std::pair<diff::hunk, size_t> patch::hunk(size_t hunk_index) const {
   size_t lines_in_hunk;
   if (git_patch_get_hunk(&hunk_result_ptr, &lines_in_hunk, c_ptr_, hunk_index))
     throw git_exception();
-  return {hunk_result, lines_in_hunk};
+  return std::pair<diff::hunk, size_t>{hunk_result, lines_in_hunk};
 }
 
 diff::line patch::line_in_hunk(size_t hunk_index, size_t line_of_hunk) const {
@@ -75,7 +75,8 @@ std::tuple<size_t, size_t, size_t> patch::line_stats() const {
   if (git_patch_line_stats(&context_lines, &addition_lines, &deletion_lines,
                            c_ptr_))
     throw git_exception();
-  return {context_lines, addition_lines, deletion_lines};
+  return std::tuple<size_t, size_t, size_t>{context_lines, addition_lines,
+                                            deletion_lines};
 }
 
 size_t patch::num_hunks() const { return git_patch_num_hunks(c_ptr_); }
diff --git a/src/remote.cpp b/src/remote.cpp
@@ -74,8 +74,9 @@ void remote::download(const strarray &refspecs, const fetch::options &options) {
     throw git_exception();
 }
 
-void remote::fetch_data(const strarray &refspecs, const std::string &reflog_message,
-                   const fetch::options &options) {
+void remote::fetch_data(const strarray &refspecs,
+                        const std::string &reflog_message,
+                        const fetch::options &options) {
   if (git_remote_fetch(c_ptr_, refspecs.c_ptr(), options.c_ptr(),
                        reflog_message.c_str()))
     throw git_exception();
diff --git a/src/repository.cpp b/src/repository.cpp
@@ -245,7 +245,8 @@ std::pair<std::string, std::string> repository::identity() const {
   const char *name_c, *email_c;
   if (git_repository_ident(&name_c, &email_c, c_ptr_))
     throw git_exception();
-  return {name_c ? name_c : "", email_c ? email_c : ""};
+  return std::pair<std::string, std::string>{name_c ? name_c : "",
+                                             email_c ? email_c : ""};
 }
 
 cppgit2::index repository::index() const {
@@ -820,7 +821,7 @@ repository::extract_signature_from_commit(oid id,
   if (git_commit_extract_signature(sig.c_ptr(), signed_data.c_ptr(), c_ptr_,
                                    id.c_ptr(), signature_field.c_str()))
     throw git_exception();
-  return {sig, signed_data};
+  return std::pair<data_buffer, data_buffer>{sig, signed_data};
 }
 
 commit repository::lookup_commit(const oid &id) {
@@ -963,7 +964,7 @@ repository::unique_commits_ahead_behind(const oid &local,
   if (git_graph_ahead_behind(&ahead, &behind, c_ptr_, local.c_ptr(),
                              upstream.c_ptr()))
     throw git_exception();
-  return {ahead, behind};
+  return std::pair<size_t, size_t>{ahead, behind};
 }
 
 bool repository::is_descendant_of(const oid &commit,
@@ -1004,8 +1005,9 @@ repository::analyze_merge(const std::vector<annotated_commit> &their_heads) {
                          num_commits))
     throw git_exception();
 
-  return {static_cast<merge::analysis_result>(analysis_result),
-          static_cast<merge::preference>(preference)};
+  return std::pair<merge::analysis_result, merge::preference>{
+      static_cast<merge::analysis_result>(analysis_result),
+      static_cast<merge::preference>(preference)};
 }
 
 std::pair<merge::analysis_result, merge::preference>
@@ -1026,8 +1028,9 @@ repository::analyze_merge(const reference &our_ref,
           their_heads.size()))
     throw git_exception();
 
-  return {static_cast<merge::analysis_result>(analysis_result),
-          static_cast<merge::preference>(preference)};
+  return std::pair<merge::analysis_result, merge::preference>{
+      static_cast<merge::analysis_result>(analysis_result),
+      static_cast<merge::preference>(preference)};
 }
 
 oid repository::find_merge_base(const oid &first_commit,
@@ -1166,7 +1169,7 @@ repository::create_note(const commit &parent, const signature &author,
                              committer.c_ptr(), id.c_ptr(), note.c_str(),
                              allow_note_override))
     throw git_exception();
-  return {notes_commit_out, notes_blob_out};
+  return std::pair<oid, oid>{notes_commit_out, notes_blob_out};
 }
 
 note repository::read_note(const std::string &notes_ref, const oid &id) {
@@ -1582,7 +1585,7 @@ repository::revparse_to_object_and_reference(const std::string &spec) {
   if (git_revparse_ext(&object_out.c_ptr_, &reference_out.c_ptr_, c_ptr_,
                        spec.c_str()))
     throw git_exception();
-  return {object_out, reference_out};
+  return std::pair<object, reference>{object_out, reference_out};
 }
 
 object repository::revparse_to_object(const std::string &spec) {
diff --git a/src/worktree.cpp b/src/worktree.cpp
@@ -18,12 +18,12 @@ std::pair<bool, std::string> worktree::is_locked() const {
   if (ret > 0) {
     // Locked
     if (result.c_ptr()->size) // size > 0 => reason available
-      return {true, result.to_string()};
+      return std::pair<bool, std::string>{true, result.to_string()};
     else
-      return {true, ""};
+      return std::pair<bool, std::string>{true, ""};
   } else if (ret == 0) {
     // Not locked
-    return {false, ""};
+    return std::pair<bool, std::string>{false, ""};
   } else {
     throw git_exception();
   }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class libgit2_api {`
`17`	`17`	`int major, minor, revision;`
`18`	`18`	`if (git_libgit2_version(&major, &minor, &revision))`
`19`	`19`	`throw git_exception();`
`20`		`- return {major, minor, revision};`
	`20`	`+ return std::tuple<int, int, int>{major, minor, revision};`
`21`	`21`	`}`
`22`	`22`	`};`
`23`	`23`