refactor method of calling getPtr

Author: klemens-morgenstern

include/mrdox/Errors.hpp

@@ -12,7 +12,7 @@
 #ifndef MRDOX_ERRORS_HPP
 #define MRDOX_ERRORS_HPP
 
-#include <mrdox/detail/access.hpp>
+#include <mrdox/detail/Errors.hpp>
 #include <llvm/Support/Error.h>
 #include <llvm/Support/raw_ostream.h>
 #include <cassert>
@@ -24,13 +24,6 @@
 namespace clang {
 namespace mrdox {
 
-//------------------------------------------------
-
-// VFALCO CLEAN UP THIS HACK!
-namespace detail {
-CONST_FUNCTION_ACCESS(callGetPtr, llvm::Error, getPtr, llvm::ErrorInfoBase*);
-} // detail
-
 //------------------------------------------------
 //
 // ErrorCode
@@ -48,7 +41,7 @@ class ErrorCode
     llvm::ErrorInfoBase const*
     getPtr(llvm::Error const& e) noexcept
     {
-        return access::callFunction<detail::callGetPtr>(e);
+        return llvm::Expected<llvm::ErrorCodeAccess>::getPtr(e);
     }
 
     static
@@ -218,7 +211,7 @@ class Result
 
     /** Constructor.
     */
-    template<class T>
+    //template<class T>
     Result(llvm::Expected<T>&& ex)
     {
         construct(std::move(ex));

include/mrdox/detail/Errors.hpp

@@ -0,0 +1,34 @@
+//
+// This is a derivative work. originally part of the LLVM Project.
+// Licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// Copyright (c) 2023 Vinnie Falco ([email protected])
+//
+// Official repository: https://github.com/cppalliance/mrdox
+//
+
+#ifndef MRDOX_DETAIL_ERRORS_HPP
+#define MRDOX_DETAIL_ERRORS_HPP
+
+#include <llvm/Support/Error.h>
+
+namespace llvm {
+
+struct ErrorCodeAccess;
+
+template<>
+struct llvm::Expected<ErrorCodeAccess>
+{
+    static
+    llvm::ErrorInfoBase const*
+    getPtr(llvm::Error const& e)
+    {
+        return e.getPtr();
+    }
+};
+
+} // clang
+
+#endif

include/mrdox/detail/access.hpp

@@ -14,7 +14,7 @@
 
 #include "jad/Info.hpp"
 #include "jad/Location.hpp"
-#include <optional>
+#include "llvm/ADT/Optional.h"
 
 namespace clang {
 namespace mrdox {
@@ -35,7 +35,7 @@ struct SymbolInfo
 
     void merge(SymbolInfo&& I);
 
-    std::optional<Location> DefLoc;     // Location where this decl is defined.
+    llvm::Optional<Location> DefLoc;     // Location where this decl is defined.
     llvm::SmallVector<Location, 2> Loc; // Locations where this decl is declared.
 };