Skip to content

Conversation

justinctlam
Copy link
Contributor

The purpose of this change is to gate C++ code behind a cplusplus define so that FLEX can be made into a module for Swift code. Swift modules do not allow for C++ code. However this means if FLEX is used a Swift module, it will not have functionality of the excluded code. Ideally in the future, FLEX can be converted fully to support Swift without bridging headers.

The purpose of this change is to gate C++ code behind a cplusplus define so that FLEX can be made into a module for Swift code.  Swift modules do not allow for C++ code.  However this means if FLEX is used a Swift module, it will not have functionality of the excluded code. Ideally in the future, FLEX can be converted fully to support Swift without bridging headers.
@justinctlam
Copy link
Contributor Author

cc: @matrush

@NSExceptional
Copy link
Collaborator

Bear with me, I don't know what this really fixes. Doesn't FLEX already work in Swift projects?

We use a different build setup internally, and we need all headers to be able to stand on their own. This file is using NS_ENUM, which is defined in Foundation, without importing it, so we're adding the import to resolve that.
@justinctlam justinctlam changed the title Add C++ ifdefs around C++ code. Add foundation header to ActivityStreamSPI. Aug 19, 2020
@NSExceptional NSExceptional added the awaiting response … from the author, to proceed label Aug 19, 2020
@justinctlam
Copy link
Contributor Author

Sorry about the original changes, I worked with a colleague to find a much better change.

@justinctlam
Copy link
Contributor Author

For some context, our company uses a different build setup internally, and we need all headers to be able to stand on their own. This file is using NS_ENUM, which is defined in Foundation, without importing it, so we're adding the import to resolve that.

@NSExceptional NSExceptional removed the awaiting response … from the author, to proceed label Aug 19, 2020
@NSExceptional NSExceptional merged commit 57db7e1 into FLEXTool:master Aug 19, 2020
NSExceptional pushed a commit that referenced this pull request Oct 13, 2020
* Add C++ ifdefs around C++ code.

The purpose of this change is to gate C++ code behind a cplusplus define so that FLEX can be made into a module for Swift code.  Swift modules do not allow for C++ code.  However this means if FLEX is used a Swift module, it will not have functionality of the excluded code. Ideally in the future, FLEX can be converted fully to support Swift without bridging headers.

* Revert "Add C++ ifdefs around C++ code."

This reverts commit 77c0220.

* Add include <Foundation/Foundation.h> to ActivityStreamSPI header

We use a different build setup internally, and we need all headers to be able to stand on their own. This file is using NS_ENUM, which is defined in Foundation, without importing it, so we're adding the import to resolve that.
chrisczupak pushed a commit to chrisczupak/FLEX that referenced this pull request Oct 19, 2020
* Add C++ ifdefs around C++ code.

The purpose of this change is to gate C++ code behind a cplusplus define so that FLEX can be made into a module for Swift code.  Swift modules do not allow for C++ code.  However this means if FLEX is used a Swift module, it will not have functionality of the excluded code. Ideally in the future, FLEX can be converted fully to support Swift without bridging headers.

* Revert "Add C++ ifdefs around C++ code."

This reverts commit 77c0220.

* Add include <Foundation/Foundation.h> to ActivityStreamSPI header

We use a different build setup internally, and we need all headers to be able to stand on their own. This file is using NS_ENUM, which is defined in Foundation, without importing it, so we're adding the import to resolve that.
luissilvaos added a commit to OutSystems/FLEX that referenced this pull request Oct 22, 2020
* master: (364 commits)
  Reverse view snapshot slider ends, fix FLEXTool#429
  Fix FLEXTool#433, refresh explorer after edits
  Table sections can update themselves
  FLEXample project Xcode 12 update
  Update copyright
  Fix FLEXTool#450: broken search on NSUserDefaults
  FLEXMethod.imagePath should use the method's IMP
  Silence new weird documentation warning…
  Commit FLEXTests scheme
  Xcode 12 upgrade check for main scheme
  Add FLEX_EXIT_IF_NO_CTORS, fix FLEXTool#470
  Add foundation header to ActivityStreamSPI. (FLEXTool#461)
  Remove a retain cylce in FLEXSystemLogViewController
  Fix crash when opening Keychain item without a password
  Return empty array when the rows are nil in FLEXSQLResult
  Sort realm table names alphabetically (FLEXTool#453)
  fix baseResumeClass name for iOS14+
  Skip keyboard shortcut override when setting defaults
  Add sharedApplication property at runtime for iOS 9
  Add better debugging message for FLEXProperty and FLEXIvar
  ...

# Conflicts:
#	Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.m
#	Classes/Editing/FLEXFieldEditorViewController.m
#	Classes/ExplorerInterface/FLEXExplorerViewController.m
#	Classes/GlobalStateExplorers/FLEXGlobalsTableViewController.m
#	Classes/GlobalStateExplorers/SystemLog/FLEXSystemLogTableViewController.m
#	Classes/Manager/FLEXManager.m
#	Classes/Network/FLEXNetworkHistoryTableViewController.m
#	Classes/Network/FLEXNetworkTransactionCell.m
#	Classes/Network/FLEXNetworkTransactionDetailController.m
#	Classes/ObjectExplorers/Controllers/FLEXColorExplorerViewController.m
#	Classes/ObjectExplorers/Controllers/FLEXObjectExplorerViewController.h
#	Classes/Toolbar/FLEXExplorerToolbar.m
#	Classes/Toolbar/FLEXToolbarItem.m
#	Classes/Utility/FLEXColor.h
#	Classes/Utility/FLEXColor.m
#	Classes/Utility/FLEXResources.m
#	Classes/Utility/FLEXUtility.m
#	Classes/Utility/Keyboard/FLEXKeyboardShortcutManager.m
#	Classes/ViewHierarchy/FLEXHierarchyTableViewController.m
#	Classes/ViewHierarchy/FLEXImagePreviewViewController.m
#	Example/UICatalog/Base.lproj/Main_iPad.storyboard
#	Example/UICatalog/Base.lproj/Main_iPhone.storyboard
#	FLEX.podspec
#	FLEX.xcodeproj/project.pbxproj
timonus pushed a commit to timonus/FLEX that referenced this pull request May 1, 2023
* Add C++ ifdefs around C++ code.

The purpose of this change is to gate C++ code behind a cplusplus define so that FLEX can be made into a module for Swift code.  Swift modules do not allow for C++ code.  However this means if FLEX is used a Swift module, it will not have functionality of the excluded code. Ideally in the future, FLEX can be converted fully to support Swift without bridging headers.

* Revert "Add C++ ifdefs around C++ code."

This reverts commit 77c0220.

* Add include <Foundation/Foundation.h> to ActivityStreamSPI header

We use a different build setup internally, and we need all headers to be able to stand on their own. This file is using NS_ENUM, which is defined in Foundation, without importing it, so we're adding the import to resolve that.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants