fix: std::string casts

gwaldron · Aug 19, 2024 · ef27cba · ef27cba
1 parent 30b6a75
commit ef27cba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -46,7 +46,13 @@ jobs:
       shell: bash
       working-directory: ${{ runner.workspace }}/build
       run: |
-        cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOSGEARTH_BUILD_TESTS=OFF -DOSGEARTH_BUILD_LEGACY_SPLAT_NODEKIT=ON -DOSGEARTH_BUILD_PROCEDURAL_NODEKIT=ON -DCMAKE_CXX_STANDARD:STRING=17 -DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON -GXcode -DVCPKG_MANIFEST_DIR=$GITHUB_WORKSPACE/vcpkg
+        cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+          -DCMAKE_CXX_STANDARD:STRING=17 \
+          -DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON \
+          -DOSGEARTH_BUILD_LEGACY_SPLAT_NODEKIT=ON \
+          -DOSGEARTH_BUILD_PROCEDURAL_NODEKIT=ON \
+          -DOSGEARTH_BUILD_TESTS=OFF \
+          -GXcode -DVCPKG_MANIFEST_DIR=$GITHUB_WORKSPACE/vcpkg
 
     - name: 'Upload cmake configure log artifact'
       uses: actions/upload-artifact@v2

diff --git a/src/osgEarthImGui/LifeMapLayerGUI b/src/osgEarthImGui/LifeMapLayerGUI
@@ -185,17 +185,17 @@ namespace osgEarth
                     {
                         LandCoverSample sample = _landcoverUnderMouse.value();
                         if (sample.biomeid().isSet())
-                            ImGui::Text("biome_id = %s", sample.biomeid().get());
+                            ImGui::Text("biome_id = %s", sample.biomeid().get().c_str());
                         if (sample.dense().isSet())
                             ImGui::Text("dense = %.2f", sample.dense().get());
                         if (sample.lush().isSet())
                             ImGui::Text("lush = %.2f", sample.lush().get());
                         if (sample.rugged().isSet())
                             ImGui::Text("rugged = %.2f", sample.rugged().get());
                         if (sample.material().isSet())
-                            ImGui::Text("material = %s", sample.material().get());
+                            ImGui::Text("material = %s", sample.material().get().c_str());
                         if (sample.soiltype().isSet())
-                            ImGui::Text("soiltype = %s", sample.soiltype().get());
+                            ImGui::Text("soiltype = %s", sample.soiltype().get().c_str());
                     }
                 }