Commit ad86bd0c authored by Sean McBride's avatar Sean McBride

Removed last of leftover vtkstd crud

There wasn't much left.

Notably, don't #define vtkstd at all anymore.
parent 5f52c1a9
......@@ -129,11 +129,6 @@
# define VTK_USE_ANSI_STDLIB
#endif
/* Setup vtkstd, a portable namespace for std. */
#ifndef VTK_LEGACY_REMOVE
# define vtkstd std
#endif
/* Define a "vtkstd_bool" for backwards compatibility. Only use bool
if this file is included by a c++ file. */
#ifndef VTK_LEGACY_REMOVE
......
......@@ -43,7 +43,7 @@ class vtkStringArray;
class vtkSimpleMutexLock;
class vtkUnsignedShortArray;
// Hidden STL reference: vtkstd::vector<vtkAbstractArray*>
// Hidden STL reference: std::vector<vtkAbstractArray*>
class MyStdVectorOfVtkAbstractArrays;
class VTKDOMAINSCHEMISTRY_EXPORT vtkBlueObeliskData : public vtkObject
......
#ifndef vtkLabelHierarchyPrivate_h
#define vtkLabelHierarchyPrivate_h
#include "vtkObject.h" // for vtkstd
#include <set>
#include "octree/octree"
......
......@@ -20,6 +20,6 @@
#define __freerangeTestDriver_h
#include "vtkObject.h" // for vtkstd
#include "vtkTestDriver.h" // for vtkstd/exception include and warning pragmas
#include "vtkTestDriver.h" // for <exception> include and warning pragmas
#endif // __freerangeTestDriver_h
#include <octree>
#include "vtkObject.h" // for vtkstd STL stuff
#include <iostream>
int main()
......
#ifndef vtkstd_@VTK_STL_HEADER@
#define vtkstd_@VTK_STL_HEADER@
#include "vtkConfigure.h"
/* Avoid warnings in MSVC standard headers. */
#if defined(_MSC_VER)
# pragma warning (push, 1)
# pragma warning (disable: 4702)
# pragma warning (disable: 4786)
#endif
/* The HP standard library defines the functor "times" instead of
"multiplies" as specified by C++98 20.3.2 for backward
compatibility with earlier specifications. Defining this macro
fixes this behavior. The name "times" also conflicts with the
function declared in sys/times.h on that platform, so we must do
this as a work-around anyway. */
#if defined(__HP_aCC) && !defined(__HPACC_USING_MULTIPLIES_IN_FUNCTIONAL)
# define __HPACC_USING_MULTIPLIES_IN_FUNCTIONAL
# define VTK_DEFINED___HPACC_USING_MULTIPLIES_IN_FUNCTIONAL
#endif
/* Include the real header. */
#include <@VTK_STL_HEADER@>
/* Cleanup. */
#if defined(VTK_DEFINED___HPACC_USING_MULTIPLIES_IN_FUNCTIONAL)
# undef VTK_DEFINED___HPACC_USING_MULTIPLIES_IN_FUNCTIONAL
# undef __HPACC_USING_MULTIPLIES_IN_FUNCTIONAL
#endif
#if defined(_MSC_VER)
# pragma warning(pop)
#endif
#endif
......@@ -334,17 +334,17 @@ ID [a-zA-Z_\x80-\xff][0-9a-zA-Z_\x80-\xff]*
("APIENTRY"|"CALLBACK"|"WINAPI") /* misc unused win32 macros */
("vtkstd::"|"std::")?"ostream"/[^a-zA-Z_] {
("std::")?"ostream"/[^a-zA-Z_] {
yylval.str = vtkstrndup(yytext, yyleng);
return(OSTREAM);
}
("vtkstd::"|"std::")?"istream"/[^a-zA-Z_] {
("std::")?"istream"/[^a-zA-Z_] {
yylval.str = vtkstrndup(yytext, yyleng);
return(ISTREAM);
}
("vtkstd::"|"std::")?"string"/[^a-zA-Z_] {
("std::")?"string"/[^a-zA-Z_] {
yylval.str = vtkstrndup(yytext, yyleng);
return(StdString);
}
......
......@@ -653,7 +653,6 @@ size_t vtkParse_BasicTypeFromString(
m = 0;
if (strncmp(cp, "::", 2) == 0) { m = 2; }
else if (strncmp(cp, "std::", 5) == 0) { m = 5; }
else if (strncmp(cp, "vtkstd::", 8) == 0) { m = 8; }
/* advance past the namespace */
tmpcp = cp + m;
......
......@@ -116,11 +116,7 @@ size_t vtkWrapPython_PyTemplateName(const char *name, char *pname)
/* look for VTK types that become common python types */
if ((n == 12 && strncmp(name, "vtkStdString", n) == 0) ||
(n == 11 && strncmp(name, "std::string", n) == 0)
#ifndef VTK_LEGACY_REMOVE
|| (n == 14 && strncmp(name, "vtkstd::string", n) == 0)
#endif
)
(n == 11 && strncmp(name, "std::string", n) == 0))
{
strcpy(pname, "str");
return n;
......
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