Changeset 410 for trunk/src/stl

Timestamp:

07/08/15 17:33:38 (10 years ago)

Author:

epyon

Message:

• merge of vertex_descriptor and key_descriptor concepts - unified raw data description via data_descriptor
• minor bugfixes

File:

• trunk/src/stl/assert.cc (modified) (1 diff)

trunk/src/stl/assert.cc

@@ -5 +5 @@
 // For conditions of distribution and use, see copying.txt file in root folder.
 
-#define NV_BASE_COMMON_HH
-#define NV_INTERNAL_INCLUDE
-#include "nv/base/assert.hh"
-#undef NV_BASE_COMMON_HH
+#include "nv/base/common.hh"
 #include "nv/core/logging.hh"
 
 extern "C" {
 #if NV_COMPILER == NV_MSVC
-        NV_NORETURN void __cdecl exit( _In_ int _Code );
+        _ACRTIMP NV_NORETURN void __cdecl exit( _In_ int _Code );
 #else
         void exit( int status_code ) NV_NORETURN;