Merge branch 'experimental'

Utilities/KWSys/vtksys/CMakeLists.txt

@@ -569,10 +569,6 @@ IF(KWSYS_USE_SystemTools)
     "Checking whether CXX compiler has unsetenv" DIRECT)
   KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H
     "Checking whether CXX compiler has environ in stdlib.h" DIRECT)
-<<<<<<< HEAD
-  SET_SOURCE_FILES_PROPERTIES(SystemTools.cxx PROPERTIES
-    COMPILE_FLAGS "-DKWSYS_CXX_HAS_SETENV=${KWSYS_CXX_HAS_SETENV} -DKWSYS_CXX_HAS_UNSETENV=${KWSYS_CXX_HAS_UNSETENV} -DKWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H=${KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H}")
-=======
   KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_UTIMES
     "Checking whether CXX compiler has utimes" DIRECT)
   KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_UTIMENSAT
@@ -584,7 +580,6 @@ IF(KWSYS_USE_SystemTools)
     KWSYS_CXX_HAS_UTIMES=${KWSYS_CXX_HAS_UTIMES}
     KWSYS_CXX_HAS_UTIMENSAT=${KWSYS_CXX_HAS_UTIMENSAT}
     )
->>>>>>> kitware/master
 ENDIF()
 
 IF(KWSYS_USE_SystemInformation)

Utilities/KWSys/vtksys/CommandLineArguments.hxx.in

@@ -44,11 +44,7 @@ struct CommandLineArgumentsCallbackStructure;
  *
  * For the variable interface you associate variable with each argument. When
  * the argument is specified, the variable is set to the specified value casted
-<<<<<<< HEAD
- * to the apropriate type. For boolean (NO_ARGUMENT), the value is "1".
-=======
  * to the appropriate type. For boolean (NO_ARGUMENT), the value is "1".
->>>>>>> kitware/master
  *
  * Both interfaces can be used at the same time. 
  *
@@ -103,11 +99,7 @@ public:
     STRING_TYPE,          // The variable is string (char*)
     STL_STRING_TYPE,      // The variable is string (char*)
     VECTOR_INT_TYPE,             // The variable is integer (int)
-<<<<<<< HEAD
-    VECTOR_BOOL_TYPE,            // The vairable is boolean (bool)
-=======
     VECTOR_BOOL_TYPE,            // The variable is boolean (bool)
->>>>>>> kitware/master
     VECTOR_DOUBLE_TYPE,          // The variable is float (double)
     VECTOR_STRING_TYPE,          // The variable is string (char*)
     VECTOR_STL_STRING_TYPE,      // The variable is string (char*)
@@ -136,11 +128,7 @@ public:
   void ProcessArgument(const char* arg);
 
   /**
-<<<<<<< HEAD
-   * This method will parse arguments and call apropriate methods. 
-=======
    * This method will parse arguments and call appropriate methods.
->>>>>>> kitware/master
    */
   int Parse();
 
@@ -156,11 +144,7 @@ public:
   /**
    * Add handler for argument which is going to set the variable to the
    * specified value. If the argument is specified, the option is casted to the
-<<<<<<< HEAD
-   * apropriate type.
-=======
    * appropriate type.
->>>>>>> kitware/master
    */
   void AddArgument(const char* argument, ArgumentTypeEnum type,
     bool* variable, const char* help);
@@ -176,11 +160,7 @@ public:
   /**
    * Add handler for argument which is going to set the variable to the
    * specified value. If the argument is specified, the option is casted to the
-<<<<<<< HEAD
-   * apropriate type. This will handle the multi argument values.
-=======
    * appropriate type. This will handle the multi argument values.
->>>>>>> kitware/master
    */
   void AddArgument(const char* argument, ArgumentTypeEnum type,
     kwsys_stl::vector<bool>* variable, const char* help);

Utilities/KWSys/vtksys/ProcessUNIX.c

@@ -47,15 +47,12 @@ do.
 
 */
 
-<<<<<<< HEAD
-=======
 #if defined(__CYGWIN__)
 /* Increase the file descriptor limit for select() before including
    related system headers. (Default: 64) */
 # define FD_SETSIZE 16384
 #endif
 
->>>>>>> kitware/master
 #include <stddef.h>    /* ptrdiff_t */
 #include <stdio.h>     /* snprintf */
 #include <stdlib.h>    /* malloc, free */