Changeset 237 for trunk/nv/common.hh

Timestamp:

05/14/14 19:08:41 (11 years ago)

Author:

epyon

Message:

• debug_draw module added
• evil vertex descriptor and info added
• fix for sampler objects
• various fixes

File:

• trunk/nv/common.hh (modified) (2 diffs)

trunk/nv/common.hh

@@ -101 +101 @@
 
 #if NV_COMPILER == NV_MSVC 
-#pragma warning(disable: 4201)
-#undef _SCL_SECURE_NO_WARNINGS // to prevent redefinig
+#pragma warning( disable : 4201 ) // nonstandard extension used : nameless struct/union
+#pragma warning( disable : 4510 ) // default constructor could not be generated
+#pragma warning( disable : 4610 ) // object 'class' can never be instantiated - user-defined constructor required
+#undef _SCL_SECURE_NO_WARNINGS // to prevent redefining
 #define _SCL_SECURE_NO_WARNINGS
 #endif
@@ -170 +172 @@
         typedef uint64 uid;
 
+        struct empty_type {};
+
 } // namespace nv