Merge pull request #1548 from CesiumGS/using-namespace-cesiumgltf

Fix CesiumGltf namespace problems.
CesiumGS · Nov 15, 2024 · 871393b · 871393b
2 parents 6b0c9b6 + 8c72176
commit 871393b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -84,7 +84,7 @@ jobs:
       unreal-engine-zip: "s3://cesium-unreal-engine/UE_52_macOS.zip"
       unreal-program-name: "UE_5.2"
       upload-package-base-name: "CesiumForUnreal-52-apple"
-      xcode-version: "14.3.1"
+      xcode-version: "15.4"
   Combine52:
     runs-on: ubuntu-latest
     needs: [Windows52, Linux52, Android52, Apple52]
@@ -202,7 +202,7 @@ jobs:
       unreal-engine-zip: "s3://cesium-unreal-engine/5.3.0/UE_53_macOS.zip"
       unreal-program-name: "UE_5.3"
       upload-package-base-name: "CesiumForUnreal-53-apple"
-      xcode-version: "14.3.1"
+      xcode-version: "15.4"
   Combine53:
     runs-on: ubuntu-latest
     needs: [Windows53, Android53, Linux53, Apple53]
@@ -320,7 +320,7 @@ jobs:
       unreal-engine-zip: "s3://cesium-unreal-engine/5.4.0/UE_54_macOS.zip"
       unreal-program-name: "UE_5.4"
       upload-package-base-name: "CesiumForUnreal-54-apple"
-      xcode-version: "14.3.1"
+      xcode-version: "15.4"
   Combine54:
     runs-on: ubuntu-latest
     needs: [Windows54, Android54, Linux54, Apple54]

diff --git a/.github/workflows/buildApple.yml b/.github/workflows/buildApple.yml
@@ -31,6 +31,8 @@ jobs:
           ls /Applications
           brew uninstall google-chrome
           sudo rm -rf /Users/runner/Library/Android
+          sudo rm -rf /Applications/Xcode_14.3.app
+          sudo rm -rf /Applications/Xcode_14.3.1.app
           sudo rm -rf /Applications/Xcode_15.0.1.app
           sudo rm -rf /Applications/Xcode_15.0.app
           sudo rm -rf /Applications/Xcode_15.1.0.app
@@ -39,8 +41,6 @@ jobs:
           sudo rm -rf /Applications/Xcode_15.2.app
           sudo rm -rf /Applications/Xcode_15.3.0.app
           sudo rm -rf /Applications/Xcode_15.3.app
-          sudo rm -rf /Applications/Xcode_15.4.0.app
-          sudo rm -rf /Applications/Xcode_15.4.app
           sudo rm -rf /Applications/Xcode_16.0.0.app
           sudo rm -rf /Applications/Xcode_16.0.app
           sudo rm -rf /Applications/Xcode_16.1.0.app

diff --git a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTableProperty.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTableProperty.spec.cpp
@@ -6,8 +6,6 @@
 #include "Misc/AutomationTest.h"
 #include <limits>
 
-using namespace CesiumGltf;
-
 BEGIN_DEFINE_SPEC(
     FCesiumPropertyTablePropertySpec,
     "Cesium.Unit.PropertyTableProperty",
@@ -16,6 +14,8 @@ BEGIN_DEFINE_SPEC(
 END_DEFINE_SPEC(FCesiumPropertyTablePropertySpec)
 
 void FCesiumPropertyTablePropertySpec::Define() {
+  using namespace CesiumGltf;
+
   Describe("Constructor", [this]() {
     It("constructs invalid instance by default", [this]() {
       FCesiumPropertyTableProperty property;

diff --git a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTexture.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTexture.spec.cpp
@@ -14,10 +14,10 @@ BEGIN_DEFINE_SPEC(
     "Cesium.Unit.PropertyTexture",
     EAutomationTestFlags::ApplicationContextMask |
         EAutomationTestFlags::ProductFilter)
-Model model;
-MeshPrimitive* pPrimitive;
-ExtensionModelExtStructuralMetadata* pExtension;
-PropertyTexture* pPropertyTexture;
+CesiumGltf::Model model;
+CesiumGltf::MeshPrimitive* pPrimitive;
+CesiumGltf::ExtensionModelExtStructuralMetadata* pExtension;
+CesiumGltf::PropertyTexture* pPropertyTexture;
 TObjectPtr<UCesiumGltfComponent> pModelComponent;
 TObjectPtr<UCesiumGltfPrimitiveComponent> pPrimitiveComponent;
 
@@ -29,6 +29,8 @@ const std::vector<FVector2D> texCoords{
 END_DEFINE_SPEC(FCesiumPropertyTextureSpec)
 
 void FCesiumPropertyTextureSpec::Define() {
+  using namespace CesiumGltf;
+
   BeforeEach([this]() {
     model = Model();
     pExtension = &model.addExtension<ExtensionModelExtStructuralMetadata>();

diff --git a/Source/CesiumRuntime/Private/Tests/CesiumPropertyTextureProperty.spec.cpp b/Source/CesiumRuntime/Private/Tests/CesiumPropertyTextureProperty.spec.cpp
@@ -19,6 +19,8 @@ const std::vector<FVector2D> texCoords{
 END_DEFINE_SPEC(FCesiumPropertyTexturePropertySpec)
 
 void FCesiumPropertyTexturePropertySpec::Define() {
+  using namespace CesiumGltf;
+
   Describe("Constructor", [this]() {
     It("constructs invalid instance by default", [this]() {
       FCesiumPropertyTextureProperty property;