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 Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,7 @@ let openGraphSPITestTarget = Target.testTarget(
cSettings: sharedCSettings + [
.headerSearchPath("../../Sources/OpenGraph_SPI"),
],
swiftSettings: sharedSwiftSettings,
linkerSettings: [.linkedFramework("XCTest")]
swiftSettings: sharedSwiftSettings + [.interoperabilityMode(.Cxx)]
)
let openGraphShimsTestTarget = Target.testTarget(
name: "OpenGraphShimsTests",
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraph_SPI/Data/ptr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#define ptr_hpp

#include "OGBase.h"
#include "table.hpp"
#include "OpenGraphCxx/table.hpp"
#include <bitset>
#include "page_const.hpp"

Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraph_SPI/Data/table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Status: WIP
// Modified from https://github.com/jcmosc/Compute/blob/0a6b21a4cdeb9bbdd95e7e914c4e18bed37a2456/Sources/ComputeCxx/Data/Table.cpp [MIT License]

#include "table.hpp"
#include <OpenGraphCxx/table.hpp>
#include "page.hpp"
#include "page_const.hpp"
#include "zone.hpp"
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenGraph_SPI/Data/zone.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// OpenGraph_SPI

#include "zone.hpp"
#include "table.hpp"
#include <OpenGraphCxx/table.hpp>
#include "page.hpp"
#include "../Util/assert.hpp"
#if OG_TARGET_OS_DARWIN
Expand Down
11 changes: 11 additions & 0 deletions Sources/OpenGraph_SPI/include/module.modulemap
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module OpenGraph_SPI {
header "OpenGraph-umbrella.h"
export *
}

// TODO: Change to module OpenGraphCxx and OpenGraphCxx.Internal
module OpenGraph_SPI.Cxx {
requires cplusplus
umbrella "OpenGraphCxx"
export *
}
15 changes: 15 additions & 0 deletions Tests/OpenGraph_SPITests/OpenGraph_SPITests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// OpenGraph_SPITests.swift
// OpenGraph

import OpenGraph_SPI.Cxx
import Testing

struct OpenGraph_SPITests {
#if canImport(Darwin) // table() is not implemented on Linux yet.
@Test
func table() {
OG.data.table.ensure_shared()
}
#endif
}
24 changes: 0 additions & 24 deletions Tests/OpenGraph_SPITests/table_test_case.mm

This file was deleted.