Fix macOS build

Author: wravery

.github/workflows/linux.yml

@@ -17,22 +17,29 @@ jobs:
         submodules: true
 
     - name: Install Dependencies
-      run: sudo apt-get update && sudo apt-get install -yq libgtest-dev libboost-program-options-dev rapidjson-dev ninja-build
+      run: |
+        sudo apt-get update
+        sudo apt-get install -yq libgtest-dev libboost-program-options-dev rapidjson-dev ninja-build
 
     - name: Build GTest
-      run: cmake -E make_directory gtest && cd gtest && cmake -DCMAKE_BUILD_TYPE=${{ matrix.config }} -G Ninja /usr/src/gtest && cmake --build . -j -v && sudo cmake --install .
+      run: |
+        cmake -E make_directory gtest
+        cd gtest
+        cmake -DCMAKE_BUILD_TYPE=${{ matrix.config }} -G Ninja /usr/src/gtest
+        cmake --build . -j -v
+        sudo cmake --install .
 
     - name: Create Build Environment
       run: cmake -E make_directory build
 
     - name: Configure CMake
       working-directory: build
-      run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.config }} -G Ninja $GITHUB_WORKSPACE
+      run: cmake -G Ninja ${{ github.workspace }}
 
-    - name: Build the Project
+    - name: Build
       working-directory: build
-      run: cmake --build . -j -v
+      run: cmake --build . --config ${{ matrix.config }} -j -v
 
-    - name: Run the Tests
+    - name: Test
       working-directory: build
-      run: ctest --output-on-failure
+      run: ctest -C ${{ matrix.config }} --output-on-failure

.github/workflows/macos.yml

@@ -44,14 +44,10 @@ jobs:
 
         cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" ${{ github.workspace }}
 
-    - name: Configure
-      working-directory: build/
-      run: cmake $GITHUB_WORKSPACE
-
     - name: Build
       working-directory: build/
-      run: cmake --build . --config ${{ matrix.build_type }} -j -v
+      run: cmake --build . --config ${{ matrix.config }} -v
 
     - name: Test
       working-directory: build/
-      run: ctest --config ${{ matrix.build_type }} --output-on-failure
+      run: ctest -C ${{ matrix.config }} --output-on-failure

.github/workflows/windows.yml

@@ -56,7 +56,7 @@ jobs:
 
     - name: Build
       working-directory: build/
-      run: cmake --build . --config ${{ matrix.config }} -j -v
+      run: cmake --build . --config ${{ matrix.config }} -v
 
     - name: Test
       working-directory: build/

include/graphqlservice/GraphQLSchema.h

@@ -67,12 +67,12 @@ class Schema : public std::enable_shared_from_this<Schema>
 	std::shared_ptr<const ObjectType> _query;
 	std::shared_ptr<const ObjectType> _mutation;
 	std::shared_ptr<const ObjectType> _subscription;
-	std::unordered_map<std::string_view, size_t> _typeMap;
+	internal::sorted_map<std::string_view, size_t> _typeMap;
 	std::vector<std::pair<std::string_view, std::shared_ptr<const BaseType>>> _types;
 	std::vector<std::shared_ptr<const Directive>> _directives;
-	std::unordered_map<std::shared_ptr<const BaseType>, std::shared_ptr<const BaseType>>
+	internal::sorted_map<std::shared_ptr<const BaseType>, std::shared_ptr<const BaseType>>
 		_nonNullWrappers;
-	std::unordered_map<std::shared_ptr<const BaseType>, std::shared_ptr<const BaseType>>
+	internal::sorted_map<std::shared_ptr<const BaseType>, std::shared_ptr<const BaseType>>
 		_listWrappers;
 };
 

src/GraphQLSchema.cpp

@@ -43,7 +43,7 @@ const std::shared_ptr<const BaseType>& Schema::LookupType(std::string_view name)
 {
 	auto itr = _typeMap.find(name);
 
-	if (itr == _typeMap.cend())
+	if (itr == _typeMap.end())
 	{
 		std::ostringstream message;
 
@@ -66,9 +66,9 @@ const std::shared_ptr<const BaseType>& Schema::WrapType(
 	auto& wrappers = (kind == introspection::TypeKind::LIST) ? _listWrappers : _nonNullWrappers;
 	auto itr = wrappers.find(ofType);
 
-	if (itr == wrappers.cend())
+	if (itr == wrappers.end())
 	{
-		std::tie(itr, std::ignore) = wrappers.insert({ ofType, WrapperType::Make(kind, ofType) });
+		std::tie(itr, std::ignore) = wrappers.emplace(ofType, WrapperType::Make(kind, ofType));
 	}
 
 	return itr->second;