Browse Source

Fix compile error due to namespace conflicts in VC140.

xiaohunqupo 3 năm trước cách đây
mục cha
commit
2152aae2a3
2 tập tin đã thay đổi với 14 bổ sung2 xóa
  1. 1 1
      code/AssetLib/glTF/glTFAsset.inl
  2. 13 1
      code/AssetLib/glTF2/glTF2Asset.inl

+ 1 - 1
code/AssetLib/glTF/glTFAsset.inl

@@ -53,9 +53,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 using namespace Assimp;
-using namespace glTFCommon;
 
 namespace glTF {
+using namespace glTFCommon;
 
 #if _MSC_VER
 #pragma warning(push)

+ 13 - 1
code/AssetLib/glTF2/glTF2Asset.inl

@@ -82,7 +82,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // clang-format on
 
 using namespace Assimp;
-using namespace glTFCommon;
+using glTFCommon::FindStringInContext;
+using glTFCommon::FindNumberInContext;
+using glTFCommon::FindUIntInContext;
+using glTFCommon::FindArrayInContext;
+using glTFCommon::FindObjectInContext;
+using glTFCommon::FindExtensionInContext;
+using glTFCommon::MemberOrDefault;
+using glTFCommon::ReadMember;
+using glTFCommon::FindMember;
+using glTFCommon::FindObject;
+using glTFCommon::FindUInt;
+using glTFCommon::FindArray;
+using glTFCommon::FindArray;
 
 namespace glTF2 {