Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/Attribute/AttributeType.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
// Created by Kyle on 2024/2/17.
//

#include <OpenGraphC/OGAttributeType.h>
#include <OpenGraph/OGAttributeType.h>
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/Attribute/OGAttribute.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by Kyle on 2024/2/16.
//

#include <OpenGraphC/OGAttribute.h>
#include <OpenGraph/OGAttribute.h>
#include <OpenGraphCxx/Attribute/AttributeID.hpp>
#include <OpenGraphCxx/Util/assert.hpp>
#include <optional>
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/Attribute/OGWeakAttribute.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by Kyle on 2024/2/27.
//

#include <OpenGraphC/OGWeakAttribute.h>
#include <OpenGraph/OGWeakAttribute.h>

OGWeakAttribute OGCreateWeakAttribute(OGAttribute attribute) {
// TODO
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/Comparison/OGComparison.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// OGCompareValues.cpp
// OpenGraphCxx

#include <OpenGraphC/OGComparison.h>
#include <OpenGraph/OGComparison.h>
#include <OpenGraphCxx/Comparison/OGComparisonPrivate.h>

const void *OGComparisonStateGetDestination(OGComparisonState state) {
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/Data/OGUniqueID.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Audited for iOS 18.0
// Status: Complete

#include <OpenGraphC/OGUniqueID.h>
#include <OpenGraph/OGUniqueID.h>
#include <stdatomic.h>

OGUniqueID OGMakeUniqueID(void) {
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/DebugServer/OGDebugServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by Kyle on 2024/2/17.
//

#include <OpenGraphC/OGDebugServer.h>
#include <OpenGraph/OGDebugServer.h>
#include <OpenGraphCxx/DebugServer/og-debug-server.hpp>

#if OG_TARGET_OS_DARWIN
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/DebugServer/og-debug-server.mm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <OpenGraphCxx/DebugServer/og-debug-server.hpp>
#if OG_TARGET_OS_DARWIN

#include <OpenGraphC/OGGraphDescription.h>
#include <OpenGraph/OGGraphDescription.h>
#include <OpenGraphCxx/Util/log.hpp>
#include <OpenGraphCxx/Util/assert.hpp>
#include <OpenGraphCxx/Graph/Graph.hpp>
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/Graph/Graph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <OpenGraphCxx/Graph/Graph.hpp>
#include <OpenGraphCxx/Graph/Subgraph.hpp>
#include <OpenGraphC/OGGraphDescription.h>
#include <OpenGraph/OGGraphDescription.h>

#if !OG_TARGET_OS_WASI
#include <dispatch/dispatch.h>
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/Graph/Graph.mm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// OpenGraphCxx

#include <OpenGraphCxx/Graph/Graph.hpp>
#include <OpenGraphC/OGGraphDescription.h>
#include <OpenGraph/OGGraphDescription.h>

#if OG_OBJC_FOUNDATION
#include <Foundation/Foundation.h>
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/Graph/GraphContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

#include <OpenGraphCxx/Graph/Graph.hpp>
#include <OpenGraphC/OGGraph.h>
#include <OpenGraph/OGGraph.h>
#include <OpenGraphCxx/Util/assert.hpp>

OG::Graph::Context &OG::Graph::Context::from_cf(OGGraphRef storage) OG_NOEXCEPT {
Expand Down
4 changes: 2 additions & 2 deletions Sources/OpenGraphCxx/Graph/GraphDescription.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// GraphDescription.cpp
// OpenGraphCxx

#include <OpenGraphC/OGGraphDescription.h>
#include <OpenGraphC/OGGraph.h>
#include <OpenGraph/OGGraphDescription.h>
#include <OpenGraph/OGGraph.h>
#include <OpenGraphCxx/Graph/Graph.hpp>
#include <OpenGraphCxx/Util/assert.hpp>

Expand Down
4 changes: 2 additions & 2 deletions Sources/OpenGraphCxx/Graph/GraphDescription.mm
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// GraphDescription.mm
// OpenGraphCxx

#include <OpenGraphC/OGGraphDescription.h>
#include <OpenGraphC/OGGraph.h>
#include <OpenGraph/OGGraphDescription.h>
#include <OpenGraph/OGGraph.h>
#include <OpenGraphCxx/Graph/Graph.hpp>
#include <OpenGraphCxx/Util/assert.hpp>

Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/Graph/OGGraph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by Kyle on 2024/2/15.
//

#include <OpenGraphC/OGGraph.h>
#include <OpenGraph/OGGraph.h>
#include <OpenGraphCxx/Graph/Graph.hpp>
#include <OpenGraphCxx/Util/assert.hpp>
#include <OpenGraphCxx/Data/ClosureFunction.hpp>
Expand Down
4 changes: 2 additions & 2 deletions Sources/OpenGraphCxx/Graph/OGGraphContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
// Created by Kyle on 2024/2/16.
//

#include <OpenGraphC/OGGraphContext.h>
#include <OpenGraphC/Private/CFRuntime.h>
#include <OpenGraph/OGGraphContext.h>
#include <OpenGraph/Private/CFRuntime.h>

OGGraphRef OGGraphContextGetGraph(OGGraphContextRef context) {
return reinterpret_cast<OGGraphRef>(reinterpret_cast<uintptr_t>(context) - sizeof(CFRuntimeBase));
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/Graph/OGGraphTracing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// OGGraphTracing.mm
// OpenGraphCxx

#include <OpenGraphC/OGGraphTracing.h>
#include <OpenGraph/OGGraphTracing.h>

void OGGraphStartTracing(_Nullable OGGraphRef graph, OGGraphTraceFlags options) {
OGGraphStartTracing2(graph, options, NULL);
Expand Down
6 changes: 3 additions & 3 deletions Sources/OpenGraphCxx/Graph/OGSubgraph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
// Created by Kyle on 2024/2/15.
//

#include <OpenGraphC/OGSubgraph.h>
#include <OpenGraphC/OGGraph.h>
#include <OpenGraph/OGSubgraph.h>
#include <OpenGraph/OGGraph.h>
#include <OpenGraphCxx/Graph/Subgraph.hpp>
#include <OpenGraphC/OGGraphContext.h>
#include <OpenGraph/OGGraphContext.h>
#include <OpenGraphCxx/Util/assert.hpp>
#include <OpenGraphCxx/Util/env.hpp>
#include <pthread.h>
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/Graph/Subgraph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

#include <OpenGraphCxx/Graph/Subgraph.hpp>
#include <OpenGraphC/OGSubgraph.h>
#include <OpenGraph/OGSubgraph.h>

pthread_key_t OG::Subgraph::_current_subgraph_key;

Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/Runtime/OGTupleType.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Audited for iOS 18.0
// Status: Complete

#include <OpenGraphC/OGTupleType.h>
#include <OpenGraph/OGTupleType.h>
#include <OpenGraphCxx/Runtime/metadata.hpp>
#include <OpenGraphCxx/Util/assert.hpp>

Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraphCxx/Runtime/OGTypeID.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Audited for iOS 18.0
// Status: WIP

#include <OpenGraphC/OGTypeID.h>
#include <OpenGraph/OGTypeID.h>
#include <OpenGraphCxx/Runtime/metadata.hpp>
#include <OpenGraphCxx/Util/assert.hpp>

Expand Down
4 changes: 2 additions & 2 deletions Sources/OpenGraphCxx/Version/OGVersion.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// OGVersion.c
// OpenGraph

#include <OpenGraphC/OGBase.h>
#include <OpenGraphC/OGVersion.h>
#include <OpenGraph/OGBase.h>
#include <OpenGraph/OGVersion.h>

#if OPENGRAPH_RELEASE == OPENGRAPH_RELEASE_2024
const double OpenGraphVersionNumber __attribute__ ((used)) = (double)6.0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
#ifndef OGAttribute_h
#define OGAttribute_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraphC/OGAttributeInfo.h>
#include <OpenGraphC/OGAttributeFlags.h>
#include <OpenGraphC/OGCachedValueOptions.h>
#include <OpenGraphC/OGGraph.h>
#include <OpenGraphC/OGInputOptions.h>
#include <OpenGraphC/OGTypeID.h>
#include <OpenGraphC/OGValue.h>
#include <OpenGraphC/OGValueOptions.h>
#include <OpenGraphC/OGValueState.h>
#include <OpenGraph/OGBase.h>
#include <OpenGraph/OGAttributeInfo.h>
#include <OpenGraph/OGAttributeFlags.h>
#include <OpenGraph/OGCachedValueOptions.h>
#include <OpenGraph/OGGraph.h>
#include <OpenGraph/OGInputOptions.h>
#include <OpenGraph/OGTypeID.h>
#include <OpenGraph/OGValue.h>
#include <OpenGraph/OGValueOptions.h>
#include <OpenGraph/OGValueState.h>

OG_ASSUME_NONNULL_BEGIN

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#ifndef OGAttributeFlags_h
#define OGAttributeFlags_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraph/OGBase.h>

typedef OG_OPTIONS(uint32_t, OGAttributeFlags) {
OGAttributeFlagsDefault = 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#ifndef OGAttributeInfo_h
#define OGAttributeInfo_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraphC/OGAttributeType.h>
#include <OpenGraph/OGBase.h>
#include <OpenGraph/OGAttributeType.h>

OG_ASSUME_NONNULL_BEGIN

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#ifndef OGAttributeType_h
#define OGAttributeType_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraphC/OGTypeID.h>
#include <OpenGraph/OGBase.h>
#include <OpenGraph/OGTypeID.h>

OG_ASSUME_NONNULL_BEGIN

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef OGAttributeTypeFlags_h
#define OGAttributeTypeFlags_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraph/OGBase.h>

typedef OG_OPTIONS(uint32_t, OGAttributeTypeFlags) {
OGAttributeTypeFlagsDefault = 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef OGCachedValueOptions_h
#define OGCachedValueOptions_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraph/OGBase.h>

typedef OG_OPTIONS(uint32_t, OGCachedValueOptions) {
OGCachedValueOptions_0 = 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef OGChangedValueFlags_h
#define OGChangedValueFlags_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraph/OGBase.h>

typedef OG_OPTIONS(uint32_t, OGChangedValueFlags) {
OGChangedValueFlags_1 = 1 << 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
#ifndef OGComparison_h
#define OGComparison_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraphC/OGTypeID.h>
#include <OpenGraph/OGBase.h>
#include <OpenGraph/OGTypeID.h>

OG_ASSUME_NONNULL_BEGIN

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef OGCounterQueryType_h
#define OGCounterQueryType_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraph/OGBase.h>

typedef OG_ENUM(uint32_t, OGCounterQueryType) {
OGCounterQueryType_0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef OGDebugServer_h
#define OGDebugServer_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraph/OGBase.h>

#if OG_TARGET_OS_DARWIN

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#ifndef OGGraph_h
#define OGGraph_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraphC/Private/CFRuntime.h>
#include <OpenGraphC/OGCounterQueryType.h>
#include <OpenGraph/OGBase.h>
#include <OpenGraph/Private/CFRuntime.h>
#include <OpenGraph/OGCounterQueryType.h>

// Note: Place all structure declaration in a single place to avoid header cycle dependency

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#ifndef OGGraphContext_h
#define OGGraphContext_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraphC/OGGraph.h>
#include <OpenGraph/OGBase.h>
#include <OpenGraph/OGGraph.h>

// MARK: - Exported C functions

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#ifndef OGGraphDescription_h
#define OGGraphDescription_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraphC/OGGraph.h>
#include <OpenGraph/OGBase.h>
#include <OpenGraph/OGGraph.h>

OG_ASSUME_NONNULL_BEGIN

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#ifndef OGGraphTracing_hpp
#define OGGraphTracing_hpp

#include <OpenGraphC/OGBase.h>
#include <OpenGraphC/OGGraph.h>
#include <OpenGraph/OGBase.h>
#include <OpenGraph/OGGraph.h>

typedef OG_OPTIONS(uint32_t, OGGraphTraceFlags) {
OGGraphTraceFlags_0 = 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef OGInputOptions_h
#define OGInputOptions_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraph/OGBase.h>

typedef OG_OPTIONS(uint32_t, OGInputOptions) {
OGInputOptions_0 = 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef OGSearchOptions_h
#define OGSearchOptions_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraph/OGBase.h>

typedef OG_OPTIONS(uint32_t, OGSearchOptions) {
OGSearchOptions_0 = 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
#ifndef OGSubgraph_h
#define OGSubgraph_h

#include <OpenGraphC/OGAttribute.h>
#include <OpenGraphC/OGAttributeFlags.h>
#include <OpenGraphC/OGBase.h>
#include <OpenGraphC/OGGraph.h>
#include <OpenGraphC/OGUniqueID.h>
#include <OpenGraphC/Private/CFRuntime.h>
#include <OpenGraph/OGAttribute.h>
#include <OpenGraph/OGAttributeFlags.h>
#include <OpenGraph/OGBase.h>
#include <OpenGraph/OGGraph.h>
#include <OpenGraph/OGUniqueID.h>
#include <OpenGraph/Private/CFRuntime.h>

OG_ASSUME_NONNULL_BEGIN

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#ifndef OGTupleType_h
#define OGTupleType_h

#include <OpenGraphC/OGBase.h>
#include <OpenGraphC/OGTypeID.h>
#include <OpenGraph/OGBase.h>
#include <OpenGraph/OGTypeID.h>

OG_ASSUME_NONNULL_BEGIN

Expand Down
Loading