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/preprocessor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source/slang/preprocessor.cpp')

diff --git a/source/slang/preprocessor.cpp b/source/slang/preprocessor.cpp
index ca11b24e8..47aa0cfd4 100644
--- a/source/slang/preprocessor.cpp
+++ b/source/slang/preprocessor.cpp
@@ -992,7 +992,7 @@ static Token AdvanceToken(PreprocessorDirectiveContext* context)
 static Token PeekToken(PreprocessorDirectiveContext* context)
 {
     if (IsEndOfLine(context))
-        context->preprocessor->endOfFileToken;
+        return context->preprocessor->endOfFileToken;
     return PeekToken(context->preprocessor);
 }
 
@@ -2091,11 +2091,11 @@ static const PreprocessorDirective kDirectives[] =
     { "version",    &handleGLSLVersionDirective,    0 },
     { "extension",  &handleGLSLExtensionDirective,  0 },
 
-    { NULL, NULL },
+    { nullptr, nullptr, 0 },
 };
 
 static const PreprocessorDirective kInvalidDirective = {
-    NULL, &HandleInvalidDirective, 0,
+    nullptr, &HandleInvalidDirective, 0,
 };
 
 // Look up the directive with the given name.
-- 
cgit v1.2.3