github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: Core/config.h now has include guards

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10929 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2017-03-09 22:12:57 +00:00
parent 088c597488
commit 242644b6de
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/Core/Value.hpp
View file

@ -204,9 +204,9 @@ T& Value::GetSmall() const
ASSERT(t < 255);
if(Is((byte)t))
return GetSmallRaw<T>();
throw ValueTypeError(String().Cat() << "Invalid value conversion: "
<< GetName() << " -> " << typeid(T).name(),
*this, t);
String h = String() << "Invalid value conversion: "
<< GetName() << " -> " << typeid(T).name();
throw ValueTypeError(h, *this, t);
return *(T*)&data; // Silence compiler warning
}

5
uppsrc/Core/config.h
View file

@ -1,3 +1,6 @@
#ifndef CORE_CONFIG_H // sometimes we want just these fancy platform macros from this file...
#define CORE_CONFIG_H
#include <uppconfig.h>
#if __GNUC__
@ -153,3 +156,5 @@
#if _MSC_VER >= 1900 // MSC from VS2015 is good enough C++11 compiler...
#define CPP_11
#endif
#endif