Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
1de8e54d
Commit
1de8e54d
authored
Mar 03, 2018
by
Branimir Karadžić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed GCC+Clang errors and warnings on Linux and OSX.
parent
41e24fdb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
GlslangToSpv.h
SPIRV/GlslangToSpv.h
+1
-1
Common.h
glslang/Include/Common.h
+2
-2
intermediate.h
glslang/Include/intermediate.h
+1
-1
hlslParseHelper.cpp
hlsl/hlslParseHelper.cpp
+2
-2
No files found.
SPIRV/GlslangToSpv.h
View file @
1de8e54d
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
#pragma once
#pragma once
#if _MSC_VER >= 1900
#if
defined(_MSC_VER) &&
_MSC_VER >= 1900
#pragma warning(disable : 4464) // relative include path contains '..'
#pragma warning(disable : 4464) // relative include path contains '..'
#endif
#endif
...
...
glslang/Include/Common.h
View file @
1de8e54d
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
#ifndef _COMMON_INCLUDED_
#ifndef _COMMON_INCLUDED_
#define _COMMON_INCLUDED_
#define _COMMON_INCLUDED_
#if (defined(_MSC_VER) && _MSC_VER < 1900
/*vs2015*/
) || defined MINGW_HAS_SECURE_API
#if (defined(_MSC_VER) && _MSC_VER < 1900
/*vs2015*/
)
//
|| defined MINGW_HAS_SECURE_API
#include <basetsd.h>
#include <basetsd.h>
#define snprintf sprintf_s
#define snprintf sprintf_s
#define safe_vsprintf(buf,max,format,args) vsnprintf_s((buf), (max), (max), (format), (args))
#define safe_vsprintf(buf,max,format,args) vsnprintf_s((buf), (max), (max), (format), (args))
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
#define UINT_PTR uintptr_t
#define UINT_PTR uintptr_t
#endif
#endif
#if defined(__ANDROID__) ||
_MSC_VER < 1700
#if defined(__ANDROID__) ||
(defined(_MSC_VER) && _MSC_VER < 1700)
#include <sstream>
#include <sstream>
namespace
std
{
namespace
std
{
template
<
typename
T
>
template
<
typename
T
>
...
...
glslang/Include/intermediate.h
View file @
1de8e54d
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
#ifndef __INTERMEDIATE_H
#ifndef __INTERMEDIATE_H
#define __INTERMEDIATE_H
#define __INTERMEDIATE_H
#if _MSC_VER >= 1900
#if
defined(_MSC_VER) &&
_MSC_VER >= 1900
#pragma warning(disable : 4464) // relative include path contains '..'
#pragma warning(disable : 4464) // relative include path contains '..'
#pragma warning(disable : 5026) // 'glslang::TIntermUnary': move constructor was implicitly defined as deleted
#pragma warning(disable : 5026) // 'glslang::TIntermUnary': move constructor was implicitly defined as deleted
#endif
#endif
...
...
hlsl/hlslParseHelper.cpp
View file @
1de8e54d
...
@@ -7446,8 +7446,8 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, TFunction
...
@@ -7446,8 +7446,8 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, TFunction
}
}
};
};
return
std
::
abs
(
linearize
(
to2
.
getBasicType
())
-
linearize
(
from
.
getBasicType
()))
<
return
abs
(
linearize
(
to2
.
getBasicType
())
-
linearize
(
from
.
getBasicType
()))
<
std
::
abs
(
linearize
(
to1
.
getBasicType
())
-
linearize
(
from
.
getBasicType
()));
abs
(
linearize
(
to1
.
getBasicType
())
-
linearize
(
from
.
getBasicType
()));
};
};
// for ambiguity reporting
// for ambiguity reporting
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment