Skip to content

Fixes compilation errors in ImGui-Swift flags OptionSet types in Xcode 10.2 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
r618 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes compilation errors in ImGui-Swift flags OptionSet types in Xcode 10.2 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d31b76
Fixed OptionSet RawValue type compilation error in Xcode 10.2 (and wh…
r618 Mar 30, 2019
5cf5290
Fixed few Swift (and Xcode 10.2 project) warnings
r618 Mar 30, 2019
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/ImGuiSwift/ImGuiBase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class ImGuiBase {
}

public func setup() {
io = imguiWrapper.getIO() as! ImGuiIOBridge
io = imguiWrapper.getIO() as? ImGuiIOBridge

#if os(iOS)
input = InputTextButton()
Expand Down
8 changes: 4 additions & 4 deletions Sources/ImGuiSwift/ImGuiEnums.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public struct ImGuiWindowFlags: OptionSet {

public let rawValue: Int32

public init(rawValue: ImGuiWindowFlags.RawValue) {
public init(rawValue: Int32) {
self.rawValue = rawValue
}

Expand Down Expand Up @@ -63,7 +63,7 @@ public struct ImGuiSelectableFlags: OptionSet {

public let rawValue: Int32

public init(rawValue: ImGuiSelectableFlags.RawValue) {
public init(rawValue: Int32) {
self.rawValue = rawValue
}

Expand All @@ -76,7 +76,7 @@ public struct ImGuiInputTextFlags: OptionSet {

public let rawValue: Int32

public init(rawValue: ImGuiInputTextFlags.RawValue) {
public init(rawValue: Int32) {
self.rawValue = rawValue
}

Expand Down Expand Up @@ -106,7 +106,7 @@ public struct ImGuiSetCond: OptionSet

public let rawValue: Int32

public init(rawValue: ImGuiSetCond.RawValue) {
public init(rawValue: Int32) {
self.rawValue = rawValue
}

Expand Down
4 changes: 2 additions & 2 deletions Sources/ImGuiSwift/Metal/ImGuiMetal.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public class ImGuiMetal: ImGuiBase {
if let imguiWrapper = imguiWrapper as? ImGuiWrapperMetal {
imguiWrapper.newFrame(with: commandEncoder)
}
io = imguiWrapper.getIO() as! ImGuiIOBridge
io = imguiWrapper.getIO() as? ImGuiIOBridge
#if os(iOS)
DispatchQueue.main.async {
self.input.draw(imgui: self)
Expand All @@ -109,7 +109,7 @@ public class ImGuiMetal: ImGuiBase {
if let imguiWrapper = imguiWrapper as? ImGuiWrapperMetal {
imguiWrapper.newFrame(drawable)
}
io = imguiWrapper.getIO() as! ImGuiIOBridge
io = imguiWrapper.getIO() as? ImGuiIOBridge
#if os(iOS)
input.draw(imgui: self)
#endif
Expand Down
2 changes: 1 addition & 1 deletion Sources/usynergy/uSynergy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ have occured. The time base should be a cyclic millisecond time value.

@returns Time value in milliseconds
**/
typedef uint32_t (*uSynergyGetTimeFunc)();
typedef uint32_t (*uSynergyGetTimeFunc)(void);



Expand Down
4 changes: 2 additions & 2 deletions Swift-ImGui.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1000;
LastUpgradeCheck = 0940;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = "Hiroaki Yamane";
TargetAttributes = {
994920B0211263B700D206BB = {
Expand Down Expand Up @@ -709,7 +709,7 @@
};
buildConfigurationList = 999ECC271EC6B0F6009C3E39 /* Build configuration list for PBXProject "Swift-ImGui" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down
2 changes: 1 addition & 1 deletion Swift-ImGui.xcodeproj/xcshareddata/xcschemes/Swift-ImGui-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Swift-ImGui.xcodeproj/xcshareddata/xcschemes/Swift-ImGui-macOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down