summaryrefslogtreecommitdiffstats
path: root/Common
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2017-04-06 19:25:39 +0000
committerEgor Yusov <egor.yusov@gmail.com>2017-04-06 19:25:39 +0000
commit9fe08de5b5708dbfd455b0fccaa4f8a992b14eb2 (patch)
tree4ee2e9bef2cea7684e630ce91db40921a8379178 /Common
parentMerge branch 'master' of https://github.com/DiligentGraphics/DiligentCore.git (diff)
downloadDiligentCore-9fe08de5b5708dbfd455b0fccaa4f8a992b14eb2.tar.gz
DiligentCore-9fe08de5b5708dbfd455b0fccaa4f8a992b14eb2.zip
Fixed D3D12 warnings, updated copyright notice
Diffstat (limited to 'Common')
-rw-r--r--Common/include/BasicFileStream.h2
-rw-r--r--Common/include/BasicTypes.h2
-rw-r--r--Common/include/DataBlobImpl.h2
-rw-r--r--Common/include/DebugUtilities.h2
-rw-r--r--Common/include/DefaultRawMemoryAllocator.h2
-rw-r--r--Common/include/Errors.h2
-rw-r--r--Common/include/FileWrapper.h2
-rw-r--r--Common/include/FixedBlockMemoryAllocator.h2
-rw-r--r--Common/include/FormatMessage.h2
-rw-r--r--Common/include/HashUtils.h2
-rw-r--r--Common/include/InterfaceID.h2
-rw-r--r--Common/include/LockHelper.h2
-rw-r--r--Common/include/ObjectBase.h2
-rw-r--r--Common/include/RefCntAutoPtr.h2
-rw-r--r--Common/include/RefCountedObjectImpl.h2
-rw-r--r--Common/include/STDAllocator.h2
-rw-r--r--Common/include/StringTools.h12
-rw-r--r--Common/include/Timer.h2
-rw-r--r--Common/include/UniqueIdentifier.h2
-rw-r--r--Common/include/ValidatedCast.h2
-rw-r--r--Common/include/pch.h2
-rw-r--r--Common/interface/AdvancedMath.h2
-rw-r--r--Common/interface/BasicMath.h2
-rw-r--r--Common/interface/DataBlob.h2
-rw-r--r--Common/interface/FileStream.h2
-rw-r--r--Common/interface/MemoryAllocator.h4
-rw-r--r--Common/interface/Object.h2
-rw-r--r--Common/interface/ReferenceCounters.h2
-rw-r--r--Common/src/BasicFileStream.cpp2
-rw-r--r--Common/src/DataBlobImpl.cpp2
-rw-r--r--Common/src/DefaultRawMemoryAllocator.cpp2
-rw-r--r--Common/src/FixedBlockMemoryAllocator.cpp2
-rw-r--r--Common/src/Timer.cpp2
-rw-r--r--Common/src/pch.cpp2
34 files changed, 45 insertions, 35 deletions
diff --git a/Common/include/BasicFileStream.h b/Common/include/BasicFileStream.h
index af71f9f8..306c4225 100644
--- a/Common/include/BasicFileStream.h
+++ b/Common/include/BasicFileStream.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/BasicTypes.h b/Common/include/BasicTypes.h
index 45840213..771faa15 100644
--- a/Common/include/BasicTypes.h
+++ b/Common/include/BasicTypes.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/DataBlobImpl.h b/Common/include/DataBlobImpl.h
index 7b243f2c..5b10489e 100644
--- a/Common/include/DataBlobImpl.h
+++ b/Common/include/DataBlobImpl.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/DebugUtilities.h b/Common/include/DebugUtilities.h
index 8027b0ed..040a3447 100644
--- a/Common/include/DebugUtilities.h
+++ b/Common/include/DebugUtilities.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/DefaultRawMemoryAllocator.h b/Common/include/DefaultRawMemoryAllocator.h
index 142fe6b9..bb6c2730 100644
--- a/Common/include/DefaultRawMemoryAllocator.h
+++ b/Common/include/DefaultRawMemoryAllocator.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/Errors.h b/Common/include/Errors.h
index c7028708..c5d4a3bd 100644
--- a/Common/include/Errors.h
+++ b/Common/include/Errors.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/FileWrapper.h b/Common/include/FileWrapper.h
index 41e96084..ec5ab6b1 100644
--- a/Common/include/FileWrapper.h
+++ b/Common/include/FileWrapper.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/FixedBlockMemoryAllocator.h b/Common/include/FixedBlockMemoryAllocator.h
index e91b5157..66013060 100644
--- a/Common/include/FixedBlockMemoryAllocator.h
+++ b/Common/include/FixedBlockMemoryAllocator.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/FormatMessage.h b/Common/include/FormatMessage.h
index abbacce2..4a6a552e 100644
--- a/Common/include/FormatMessage.h
+++ b/Common/include/FormatMessage.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/HashUtils.h b/Common/include/HashUtils.h
index 825d7171..cf883eb9 100644
--- a/Common/include/HashUtils.h
+++ b/Common/include/HashUtils.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/InterfaceID.h b/Common/include/InterfaceID.h
index dee585e3..d24f0b75 100644
--- a/Common/include/InterfaceID.h
+++ b/Common/include/InterfaceID.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/LockHelper.h b/Common/include/LockHelper.h
index 34b90f35..47e6b6de 100644
--- a/Common/include/LockHelper.h
+++ b/Common/include/LockHelper.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/ObjectBase.h b/Common/include/ObjectBase.h
index f92cac1e..9be99f24 100644
--- a/Common/include/ObjectBase.h
+++ b/Common/include/ObjectBase.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/RefCntAutoPtr.h b/Common/include/RefCntAutoPtr.h
index bc886187..2d99699e 100644
--- a/Common/include/RefCntAutoPtr.h
+++ b/Common/include/RefCntAutoPtr.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/RefCountedObjectImpl.h b/Common/include/RefCountedObjectImpl.h
index f42e56f1..d3c8d38c 100644
--- a/Common/include/RefCountedObjectImpl.h
+++ b/Common/include/RefCountedObjectImpl.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/STDAllocator.h b/Common/include/STDAllocator.h
index 9fc0c5cd..522e0844 100644
--- a/Common/include/STDAllocator.h
+++ b/Common/include/STDAllocator.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/StringTools.h b/Common/include/StringTools.h
index 1fe07d48..e1327d0a 100644
--- a/Common/include/StringTools.h
+++ b/Common/include/StringTools.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -43,6 +43,16 @@ inline std::string NarrowString(const std::wstring &WideStr)
return NarrowStr;
}
+inline std::wstring WidenString(const char *Str)
+{
+ std::wstring WideStr;
+ const std::ctype<wchar_t>& ctfacet = std::use_facet< std::ctype<wchar_t> >( std::wstringstream().getloc() ) ;
+ for( auto CurrChar = Str; *CurrChar != 0; ++CurrChar )
+ WideStr.push_back( ctfacet.widen( *CurrChar ) );
+
+ return WideStr;
+}
+
inline std::wstring WidenString(const std::string &Str)
{
std::wstring WideStr;
diff --git a/Common/include/Timer.h b/Common/include/Timer.h
index d0023a87..8b4c82c6 100644
--- a/Common/include/Timer.h
+++ b/Common/include/Timer.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/UniqueIdentifier.h b/Common/include/UniqueIdentifier.h
index ce539608..5d831579 100644
--- a/Common/include/UniqueIdentifier.h
+++ b/Common/include/UniqueIdentifier.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/ValidatedCast.h b/Common/include/ValidatedCast.h
index 2f68f912..1b775ad6 100644
--- a/Common/include/ValidatedCast.h
+++ b/Common/include/ValidatedCast.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/include/pch.h b/Common/include/pch.h
index 6aba18ab..14dca411 100644
--- a/Common/include/pch.h
+++ b/Common/include/pch.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/interface/AdvancedMath.h b/Common/interface/AdvancedMath.h
index d6623875..d90488f7 100644
--- a/Common/interface/AdvancedMath.h
+++ b/Common/interface/AdvancedMath.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/interface/BasicMath.h b/Common/interface/BasicMath.h
index 19d54ec2..b1ecdf17 100644
--- a/Common/interface/BasicMath.h
+++ b/Common/interface/BasicMath.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/interface/DataBlob.h b/Common/interface/DataBlob.h
index abc60215..28e483fc 100644
--- a/Common/interface/DataBlob.h
+++ b/Common/interface/DataBlob.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/interface/FileStream.h b/Common/interface/FileStream.h
index 75aba909..ab037b57 100644
--- a/Common/interface/FileStream.h
+++ b/Common/interface/FileStream.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/interface/MemoryAllocator.h b/Common/interface/MemoryAllocator.h
index d7e3289e..8221ffdc 100644
--- a/Common/interface/MemoryAllocator.h
+++ b/Common/interface/MemoryAllocator.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ class IMemoryAllocator
{
public:
/// Allocates block of memory
- virtual void* Allocate( size_t Size, const Char* dbgDescription, const char* dbgFileName, const Int32 dbgLineNumber) = 0;
+ virtual void* Allocate( size_t Size, const Char* dbgDescription, const char* dbgFileName, const Int32 dbgLineNumber) = 0;
/// Releases memory
virtual void Free(void *Ptr) = 0;
diff --git a/Common/interface/Object.h b/Common/interface/Object.h
index b8153c1e..88181522 100644
--- a/Common/interface/Object.h
+++ b/Common/interface/Object.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/interface/ReferenceCounters.h b/Common/interface/ReferenceCounters.h
index 64ced644..54c89b7a 100644
--- a/Common/interface/ReferenceCounters.h
+++ b/Common/interface/ReferenceCounters.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/src/BasicFileStream.cpp b/Common/src/BasicFileStream.cpp
index 4a7efb68..f4cff502 100644
--- a/Common/src/BasicFileStream.cpp
+++ b/Common/src/BasicFileStream.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/src/DataBlobImpl.cpp b/Common/src/DataBlobImpl.cpp
index 614a0be4..8344a4ee 100644
--- a/Common/src/DataBlobImpl.cpp
+++ b/Common/src/DataBlobImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/src/DefaultRawMemoryAllocator.cpp b/Common/src/DefaultRawMemoryAllocator.cpp
index 503a1d5b..16d25849 100644
--- a/Common/src/DefaultRawMemoryAllocator.cpp
+++ b/Common/src/DefaultRawMemoryAllocator.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/src/FixedBlockMemoryAllocator.cpp b/Common/src/FixedBlockMemoryAllocator.cpp
index 72842fe4..8483afcb 100644
--- a/Common/src/FixedBlockMemoryAllocator.cpp
+++ b/Common/src/FixedBlockMemoryAllocator.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/src/Timer.cpp b/Common/src/Timer.cpp
index 1673333a..57ac9539 100644
--- a/Common/src/Timer.cpp
+++ b/Common/src/Timer.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/Common/src/pch.cpp b/Common/src/pch.cpp
index 4502a41d..ead1e315 100644
--- a/Common/src/pch.cpp
+++ b/Common/src/pch.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.