use llvm::Optional

Author: vinniefalco

include/mrdox/Config.hpp

@@ -16,6 +16,7 @@
 #include "Representation.h"
 #include <clang/Tooling/ArgumentsAdjusters.h>
 #include <clang/Tooling/Execution.h>
+#include <llvm/ADT/Optional.h>
 #include <llvm/ADT/SmallVector.h>
 #include <llvm/ADT/StringRef.h>
 #include <memory>
@@ -55,7 +56,7 @@ struct Config
 
     // URL of repository that hosts code used
     // for links to definition locations.
-    std::optional<std::string> RepositoryUrl;
+    llvm::Optional<std::string> RepositoryUrl;
 
     bool IgnoreMappingFailures = false;
 

source/lib/BitcodeReader.cpp

@@ -13,7 +13,6 @@
 #include "llvm/ADT/IndexedMap.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/raw_ostream.h"
-#include <optional>
 
 namespace clang {
 namespace mrdox {

source/lib/BitcodeReader.h

@@ -24,7 +24,6 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Bitstream/BitstreamReader.h"
 #include "llvm/Support/Error.h"
-#include <optional>
 
 namespace clang {
 namespace mrdox {

source/lib/Representation.h

@@ -35,7 +35,6 @@
 #include <llvm/ADT/SmallVector.h>
 #include <llvm/ADT/StringExtras.h>
 #include <array>
-#include <optional>
 #include <string>
 #include <vector>
 

source/lib/jad/Enum.hpp

@@ -19,10 +19,10 @@
 
 #include "jad/Symbol.hpp"
 #include "jad/Type.hpp"
+#include <llvm/ADT/Optional.h>
 #include <llvm/ADT/SmallString.h>
 #include <llvm/ADT/SmallVector.h>
 #include <llvm/ADT/StringRef.h>
-#include <optional>
 #include <utility>
 
 namespace clang {
@@ -85,7 +85,7 @@ struct EnumInfo : SymbolInfo
     // Set to nonempty to the type when this is an explicitly typed enum. For
     //   enum Foo : short { ... };
     // this will be "short".
-    std::optional<TypeInfo> BaseType;
+    llvm::Optional<TypeInfo> BaseType;
 
     llvm::SmallVector<EnumValueInfo, 4> Members; // List of enum members.
 };

source/lib/jad/Function.hpp

@@ -19,9 +19,9 @@
 #include "jad/Template.hpp"
 #include "jad/Types.hpp"
 #include <clang/Basic/Specifiers.h>
+#include <llvm/ADT/Optional.h>
 #include <llvm/ADT/SmallString.h>
 #include <llvm/ADT/SmallVector.h>
-#include <optional>
 #include <vector>
 
 namespace clang {
@@ -58,7 +58,7 @@ struct FunctionInfo : SymbolInfo
     SmallString<16> FullName;
 
     // When present, this function is a template or specialization.
-    std::optional<TemplateInfo> Template;
+    llvm::Optional<TemplateInfo> Template;
 };
 
 /// A list of zero or more functions

source/lib/jad/Index.hpp

@@ -14,10 +14,10 @@
 
 #include "jad/Info.hpp"
 #include "jad/Reference.hpp"
+#include <llvm/ADT/Optional.h>
 #include <llvm/ADT/SmallString.h>
 #include <llvm/ADT/StringRef.h>
 #include <llvm/Support/Error.h>
-#include <optional>
 #include <vector>
 
 namespace clang {
@@ -58,7 +58,7 @@ struct Index : Reference
 
     bool operator<(const Index& Other) const;
 
-    std::optional<llvm::SmallString<16>> JumpToSection;
+    llvm::Optional<llvm::SmallString<16>> JumpToSection;
     std::vector<Index> Children;
 
     void sort();

source/lib/jad/Record.hpp

@@ -20,8 +20,8 @@
 #include "jad/Template.hpp"
 #include "jad/Types.hpp"
 #include <clang/AST/Type.h>
+#include <llvm/ADT/Optional.h>
 #include <llvm/ADT/SmallVector.h>
-#include <optional>
 #include <vector>
 
 namespace clang {
@@ -49,7 +49,7 @@ struct RecordInfo : SymbolInfo
     llvm::SmallString<16> FullName;
 
     // When present, this record is a template or specialization.
-    std::optional<TemplateInfo> Template;
+    llvm::Optional<TemplateInfo> Template;
 
     // Indicates if the record was declared using a typedef. Things like anonymous
     // structs in a typedef:

source/lib/jad/Template.hpp

@@ -13,6 +13,7 @@
 #define MRDOX_JAD_TEMPLATE_HPP
 
 #include "jad/TemplateParam.hpp"
+#include <llvm/ADT/Optional.h>
 
 namespace clang {
 namespace mrdox {
@@ -34,7 +35,7 @@ struct TemplateInfo
     std::vector<TemplateParamInfo> Params;
 
     // Set when this is a specialization of another record/function.
-    std::optional<TemplateSpecializationInfo> Specialization;
+    llvm::Optional<TemplateSpecializationInfo> Specialization;
 };
 
 } // mrdox

source/lib/jad/TemplateParams.hpp

@@ -30,10 +30,10 @@
 #include <clang/Basic/Specifiers.h>
 #include <clang/Tooling/StandaloneExecution.h>
 #include <llvm/ADT/APSInt.h>
+#include <llvm/ADT/Optional.h>
 #include <llvm/ADT/SmallVector.h>
 #include <llvm/ADT/StringExtras.h>
 #include <array>
-#include <optional>
 #include <string>
 #include <vector>
 
@@ -108,7 +108,7 @@ struct TemplateInfo {
     std::vector<TemplateParamInfo> Params;
 
     // Set when this is a specialization of another record/function.
-    std::optional<TemplateSpecializationInfo> Specialization;
+    llvm::Optional<TemplateSpecializationInfo> Specialization;
 };
 
 // Info for field types.
@@ -187,7 +187,7 @@ struct FunctionInfo : public SymbolInfo {
     SmallString<16> FullName;
 
     // When present, this function is a template or specialization.
-    std::optional<TemplateInfo> Template;
+    llvm::Optional<TemplateInfo> Template;
 };
 
 // TODO: Expand to allow for documenting templating, inheritance access,
@@ -209,7 +209,7 @@ struct RecordInfo
     SmallString<16> FullName;
 
     // When present, this record is a template or specialization.
-    std::optional<TemplateInfo> Template;
+    llvm::Optional<TemplateInfo> Template;
 
     // Indicates if the record was declared using a typedef. Things like anonymous
     // structs in a typedef:
@@ -304,7 +304,7 @@ struct EnumInfo : public SymbolInfo {
     // Set to nonempty to the type when this is an explicitly typed enum. For
     //   enum Foo : short { ... };
     // this will be "short".
-    std::optional<TypeInfo> BaseType;
+    llvm::Optional<TypeInfo> BaseType;
 
     llvm::SmallVector<EnumValueInfo, 4> Members; // List of enum members.
 };