From 4f0415e338862ffec50c2d47eddea958255b504e Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Thu, 25 Oct 2018 11:24:16 -0400
Subject: Feature/premake linux (#689)

* Premake work in progress for linux.

* Added dump function.

* Remove examples on linux
Small warning fix.

* * Don't build render-test on linux
* Removed work around virtual destructor warning, and just used virtual dtor for simplicity
* Git ignore obj directories

* Fix premake working on windows.

* * Fix sprintf_s functions
* Make generates arg parsing more robust

* Added FloatIntUnion to avoid type punning/strong aliasing issues, and repeated union definitions.

* Work around problems building on linux with getClass claiming a strict aliasing issue.

* Fix for targetBlock appearing potentiall used unintialized to gcc.

* Linux slang link options -fPIC to make dll.

* Add -fPIC to build options on linux.

* Add -ldl for linux on slang.

* Fixes to try and get premake working with .so on linux.

* Make core compile with -fPIC

* Try to fix linux linking with --no-as-needed before -ldl

* Add rpath back.

* Remove render-gl from linux build.

* Re-add location for linux.

* Don't include <malloc.h> except on windows.

* Remove unused line to fix warning on osx.

* Remove ambiguity on OSX for operator <<.

* Fixing ambiguity with operator overloading and Int types for OSX.

* Fix ambiguity around UInt and operator

* Fix ambiguity of UInt conversion for OSX.

* Added UnambiguousInt and UnambiguousUInt to make it easier to work around OSX integer coercion for UInt/Int types.
---
 source/slang/syntax.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'source/slang/syntax.h')

diff --git a/source/slang/syntax.h b/source/slang/syntax.h
index 019740a5e..7bd2afc12 100644
--- a/source/slang/syntax.h
+++ b/source/slang/syntax.h
@@ -330,8 +330,8 @@ namespace Slang
         SyntaxClassBase()
         {}
 
-        SyntaxClassBase(ClassInfo const* classInfo)
-            : classInfo(classInfo)
+        SyntaxClassBase(ClassInfo const* classInfoIn)
+            : classInfo(classInfoIn)
         {}
 
         void* createInstanceImpl() const
@@ -375,11 +375,13 @@ namespace Slang
             return (T*)createInstanceImpl();
         }
 
+        SyntaxClass(const ClassInfo* classInfoIn):
+            SyntaxClassBase(classInfoIn) 
+        {}
+
         static SyntaxClass<T> getClass()
         {
-            SyntaxClass<T> result;
-            result.classInfo = &SyntaxClass::Impl<T>::kClassInfo;
-            return result;
+            return SyntaxClass<T>(&SyntaxClassBase::Impl<T>::kClassInfo);
         }
 
         template<typename U>
-- 
cgit v1.2.3