[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61527] trunk/lib/win64_vc12/ alembic/include/Alembic/Util/PlainOldDataType.h: Win 64bit alembic: Workaround for conflict of int32 declarations

[Sergey Sharybin]

Revision: 61527
          https://developer.blender.org/rBL61527
Author:   sergey
Date:     2015-06-18 18:54:57 +0000 (Thu, 18 Jun 2015)
Log Message:
-----------
Win 64bit alembic: Workaround for conflict of int32 declarations

There's some conflict between BLI_sys_types and alembic headers which
are declaring same type in different namespaces, which confuses hell
of a lot of MSVC.

This is not really proper solution, and we'll probably be doomed to
use explicit namespace of this type in out Alembic code, but for now
we need to make Blender compilable on Windows with Alembic support.

Modified Paths:
--------------
    trunk/lib/win64_vc12/alembic/include/Alembic/Util/PlainOldDataType.h

Modified: trunk/lib/win64_vc12/alembic/include/Alembic/Util/PlainOldDataType.h
===================================================================
--- trunk/lib/win64_vc12/alembic/include/Alembic/Util/PlainOldDataType.h	2015-06-13 10:53:10 UTC (rev 61526)
+++ trunk/lib/win64_vc12/alembic/include/Alembic/Util/PlainOldDataType.h	2015-06-18 18:54:57 UTC (rev 61527)
@@ -136,7 +136,7 @@
     return a != b.asBool();
 }
 
-#if !defined(_MSC_VER)
+#if !defined(_MSC_VER) || 1
 using ::uint8_t;
 using ::int8_t;
 using ::uint16_t;