Fix: Recent/Sample Data panel cannot be turned back on (#2461) (#2462)

GeoDaCenter · Oct 10, 2023 · dbecb6e · dbecb6e
1 parent c546046
commit dbecb6e
Show file tree

Hide file tree

Showing 7 changed files with 1,122 additions and 1,228 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -5,7 +5,8 @@
       "includePath": [
         "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include",
         "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/14.0.3/include",
-        "${workspaceFolder}/**",
+        "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
+        "${workspaceFolder}",
         "/usr/local/include",
         "/usr/local/opt/boost/include",
         "/usr/local/opt/gdal/include",
@@ -18,28 +19,10 @@
       "macFrameworkPath": [
         "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks"
       ],
-      "compilerPath": "/usr/bin/clang",
       "cStandard": "c17",
       "cppStandard": "c++17",
       "intelliSenseMode": "macos-clang-arm64",
-      "compilerPathInCppPropertiesJson": "/usr/bin/gcc",
-      "mergeConfigurations": false,
-      "browse": {
-        "path": [
-          "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include",
-          "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/14.0.3/include",
-          "${workspaceFolder}/**",
-          "/usr/local/include",
-          "/usr/local/opt/boost/include",
-          "/usr/local/opt/gdal/include",
-          "/usr/local/opt/boost/include",
-          "${workspaceFolder}/BuildTools/macosx/libraries/include",
-          "${workspaceFolder}/BuildTools/macosx/libraries/include/wx-3.2",
-          "${workspaceFolder}/BuildTools/macosx/libraries/lib/wx/include/osx_cocoa-unicode-3.2",
-          "${workspaceFolder}"
-        ],
-        "limitSymbolsToIncludedHeaders": true
-      }
+      "compilerPath": "/usr/bin/gcc"
     },
     {
       "name": "Linux",
@@ -67,7 +50,6 @@
         "-std=gnu++14"
       ],
       "cppStandard": "c++17",
-      "compilerPathInCppPropertiesJson": "/usr/bin/gcc",
       "cStandard": "c11",
       "mergeConfigurations": false,
       "browse": {

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -22,5 +22,6 @@
     "editor.defaultFormatter": "ms-python.autopep8"
   },
   "python.formatting.provider": "none",
-  "activestate.promptRuntimeCreation": false
+  "activestate.promptRuntimeCreation": false,
+  "C_Cpp.default.compilerPath": "/usr/bin/clang++"
 }