Commit ac738c68 authored by Sean McBride's avatar Sean McBride

Removed branches for _MSC_VER <= 1400.

aka MSVC++ 8.0 / Visual Studio 2005.

VTK now requires MSVC++ 9.0 / Visual Studio 2008.
parent 046584f7
......@@ -73,12 +73,12 @@
#ifndef vtkSMPThreadLocal_h
#define vtkSMPThreadLocal_h
#if _MSC_VER >= 1400 && _MSC_VER <= 1700
#if _MSC_VER <= 1700
#pragma warning(push)
#pragma warning(disable : 4345)
#endif
#include <tbb/enumerable_thread_specific.h>
#if _MSC_VER >= 1400 && _MSC_VER <= 1700
#if _MSC_VER <= 1700
#pragma warning(pop)
#endif
......
......@@ -186,12 +186,6 @@
typedef long long vtkIOStreamSLL;
typedef unsigned long long vtkIOStreamULL;
# endif
#elif defined(VTK_SIZEOF___INT64)
# if defined(_MSC_VER) && (_MSC_VER < 1300)
# define VTK_IOSTREAM_NEED_OPERATORS_LL
typedef __int64 vtkIOStreamSLL;
typedef unsigned __int64 vtkIOStreamULL;
# endif
#endif
/* The maximum length of a file name in bytes including the
......
......@@ -123,11 +123,7 @@ VTK_TYPE_TRAITS(unsigned long, UNSIGNED_LONG, 0, UInt64, unsigned long, "%lu");
# if VTK_SIZEOF_LONG_LONG == 8
# define VTK_TYPE_SIZED_LONG_LONG INT64
# define VTK_TYPE_SIZED_UNSIGNED_LONG_LONG UINT64
# if defined(_MSC_VER) && _MSC_VER < 1400
# define VTK_TYPE_LONG_LONG_FORMAT "%I64"
# else
# define VTK_TYPE_LONG_LONG_FORMAT "%ll"
# endif
# define VTK_TYPE_LONG_LONG_FORMAT "%ll"
VTK_TYPE_TRAITS(long long, LONG_LONG, 1, Int64, long long,
VTK_TYPE_LONG_LONG_FORMAT "d");
VTK_TYPE_TRAITS(unsigned long long, UNSIGNED_LONG_LONG, 0, UInt64,
......
......@@ -56,17 +56,8 @@ public:
typedef typename vtkArray::CoordinateT CoordinateT;
typedef typename vtkArray::SizeT SizeT;
#if (defined(_MSC_VER) && _MSC_VER < 1400)
vtkVariant GetVariantValue(vtkIdType i) { return this->vtkArray::GetVariantValue(i); }
vtkVariant GetVariantValue(vtkIdType i, vtkIdType j) { return this->vtkArray::GetVariantValue(i,j); }
vtkVariant GetVariantValue(vtkIdType i, vtkIdType j, vtkIdType k) { return this->vtkArray::GetVariantValue(i,j,k); }
void SetVariantValue(vtkIdType i, const vtkVariant& value) { this->vtkArray::SetVariantValue(i, value); }
void SetVariantValue(vtkIdType i, vtkIdType j, const vtkVariant& value) { this->vtkArray::SetVariantValue(i,j, value); }
void SetVariantValue(vtkIdType i, vtkIdType j, vtkIdType k, const vtkVariant& value) { this->vtkArray::SetVariantValue(i,j,k, value); }
#else
using vtkTypeTemplate<vtkTypedArray<T>, vtkArray>::GetVariantValue;
using vtkTypeTemplate<vtkTypedArray<T>, vtkArray>::SetVariantValue;
#endif
void PrintSelf(ostream &os, vtkIndent indent);
......
......@@ -19,9 +19,9 @@
#if !defined(AFX_CHILDFRM_H__B7F7B85F_EEC9_11D2_87FE_0060082B79FD__INCLUDED_)
#define AFX_CHILDFRM_H__B7F7B85F_EEC9_11D2_87FE_0060082B79FD__INCLUDED_
#if _MSC_VER > 1000
#ifdef _MSC_VER
#pragma once
#endif // _MSC_VER > 1000
#endif
class CChildFrame : public CMDIChildWnd
......
......@@ -19,9 +19,9 @@
#if !defined(AFX_MAINFRM_H__B7F7B85D_EEC9_11D2_87FE_0060082B79FD__INCLUDED_)
#define AFX_MAINFRM_H__B7F7B85D_EEC9_11D2_87FE_0060082B79FD__INCLUDED_
#if _MSC_VER > 1000
#ifdef _MSC_VER
#pragma once
#endif // _MSC_VER > 1000
#endif
class CMainFrame : public CMDIFrameWnd
{
......
......@@ -18,9 +18,9 @@
#if !defined(AFX_SAMPLE_H__B7F7B859_EEC9_11D2_87FE_0060082B79FD__INCLUDED_)
#define AFX_SAMPLE_H__B7F7B859_EEC9_11D2_87FE_0060082B79FD__INCLUDED_
#if _MSC_VER > 1000
#ifdef _MSC_VER
#pragma once
#endif // _MSC_VER > 1000
#endif
#ifndef __AFXWIN_H__
#error include 'stdafx.h' before including this file for PCH
......
......@@ -19,9 +19,9 @@
#if !defined(AFX_SAMPLEDOC_H__B7F7B861_EEC9_11D2_87FE_0060082B79FD__INCLUDED_)
#define AFX_SAMPLEDOC_H__B7F7B861_EEC9_11D2_87FE_0060082B79FD__INCLUDED_
#if _MSC_VER > 1000
#ifdef _MSC_VER
#pragma once
#endif // _MSC_VER > 1000
#endif
#include "vtkMFCDocument.h"
#include "vtkDataSetReader.h"
......
......@@ -19,9 +19,9 @@
#if !defined(AFX_SAMPLEVIEW_H__B7F7B863_EEC9_11D2_87FE_0060082B79FD__INCLUDED_)
#define AFX_SAMPLEVIEW_H__B7F7B863_EEC9_11D2_87FE_0060082B79FD__INCLUDED_
#if _MSC_VER > 1000
#ifdef _MSC_VER
#pragma once
#endif // _MSC_VER > 1000
#endif
#include "vtkMFCRenderView.h"
......
......@@ -20,9 +20,9 @@
#if !defined(AFX_STDAFX_H__B7F7B85B_EEC9_11D2_87FE_0060082B79FD__INCLUDED_)
#define AFX_STDAFX_H__B7F7B85B_EEC9_11D2_87FE_0060082B79FD__INCLUDED_
#if _MSC_VER > 1000
#ifdef _MSC_VER
#pragma once
#endif // _MSC_VER > 1000
#endif
#ifndef VC_EXTRALEAN
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
......
......@@ -15,9 +15,10 @@
#if !defined(AFX_VTKMFCDOCUMENT_H__5D36A982_8081_11D2_985E_00A0CC243C06__INCLUDED_)
#define AFX_VTKMFCDOCUMENT_H__5D36A982_8081_11D2_985E_00A0CC243C06__INCLUDED_
#if _MSC_VER > 1000
#ifdef _MSC_VER
#pragma once
#endif // _MSC_VER > 1000
#endif
// vtkMFCDocument.h : header file
//
#include "vtkActorCollection.h"
......
......@@ -15,9 +15,10 @@
#if !defined(AFX_VTKMFCRENDERVIEW_H__AEB91BA7_8091_11D2_985E_00A0CC243C06__INCLUDED_)
#define AFX_VTKMFCRENDERVIEW_H__AEB91BA7_8091_11D2_985E_00A0CC243C06__INCLUDED_
#if _MSC_VER > 1000
#ifdef _MSC_VER
#pragma once
#endif // _MSC_VER > 1000
#endif
// vtkMFCRenderView.h : header file
//
#include "vtkMFCView.h"
......
......@@ -15,9 +15,10 @@
#if !defined(AFX_VTKMFCVIEW_H__5D36A981_8081_11D2_985E_00A0CC243C06__INCLUDED_)
#define AFX_VTKMFCVIEW_H__5D36A981_8081_11D2_985E_00A0CC243C06__INCLUDED_
#if _MSC_VER > 1000
#ifdef _MSC_VER
#pragma once
#endif // _MSC_VER > 1000
#endif
// vtkMFCView.h : header file
//
#define vtkMFCSetObjectMacro(name,type) \
......
......@@ -41,7 +41,7 @@
#define VTK_FOAMFILE_OUTBUFSIZE (131072)
#define VTK_FOAMFILE_INCLUDE_STACK_SIZE (10)
#if defined(_MSC_VER) && (_MSC_VER >= 1400)
#if defined(_MSC_VER)
#define _CRT_SECURE_NO_WARNINGS 1
#endif
......
......@@ -46,12 +46,8 @@ int LS_DYNA_STAT(const char* fname, struct stat64& s)
#else
int LS_DYNA_STAT(const char* fname, struct __stat64& s)
{
//windows
#if defined(_MSC_VER) && _MSC_VER < 1400
return _stat64(fname, &s);
#else
//Windows
return __stat64(fname, &s);
#endif
}
#endif
......
......@@ -50,7 +50,7 @@
# include <time.h>
# include <wchar.h>
# undef _DEBUG
# if defined(_MSC_VER) && _MSC_VER >= 1400
# if defined(_MSC_VER)
# define _CRT_NOFORCE_MANIFEST 1
# endif
#endif
......
......@@ -146,7 +146,7 @@ to the more usual form y x; without parentheses.
/* Borland and MSVC do not define __STDC__ properly. */
#if !defined(__STDC__)
# if (defined(_MSC_VER) && _MSC_VER >= 1200) || defined(__BORLANDC__)
# if defined(_MSC_VER) || defined(__BORLANDC__)
# define __STDC__ 1
# endif
#endif
......
......@@ -107,7 +107,7 @@ to the more usual form y x; without parentheses.
/* Borland and MSVC do not define __STDC__ properly. */
#if !defined(__STDC__)
# if (defined(_MSC_VER) && _MSC_VER >= 1200) || defined(__BORLANDC__)
# if defined(_MSC_VER) || defined(__BORLANDC__)
# define __STDC__ 1
# endif
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment