STYLE: Transition to friendlier formatting style.

Hopefully this will become a standard style for Xdmf development.
All spaces - 80 character line wrapping.

.gitignore

-core/XdmfVersion.hpp
-core/XdmfVersion.cpp

CMake/VersionSuite/SetUpVersion.cmake

@@ -49,7 +49,7 @@ MACRO(VersionWrite vProjectName export_name)
     FOREACH(il ${include_list})
         SET(includes "${includes}\n\#include \"${il}\"")
     ENDFOREACH(il ${include_list})
-    FILE(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/${vProjectName}Version.hpp 
+    FILE(WRITE ${CMAKE_BINARY_DIR}/${vProjectName}Version.hpp 
 "/* Current Version of ${vProjectName} 
  * Major is: ${vMajor}
  * Minor is: ${vMinor}
@@ -59,7 +59,7 @@ ${includes}
 extern ${export_name} ProjectVersion ${vProjectName}Version;\n"
     )
 
-	FILE(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/${vProjectName}Version.cpp 
+	FILE(WRITE ${CMAKE_BINARY_DIR}/${vProjectName}Version.cpp 
 "/* Current Version of ${vProjectName}
  * Make sure to include this file in your built sources 
  */

CMakeLists.txt

@@ -3,28 +3,29 @@ cmake_minimum_required(VERSION 2.6)
 
 set(BUILD_SHARED_LIBS true)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
-SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+include_directories(${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-set(CMAKE_MODULE_PATH 
-	${CMAKE_SOURCE_DIR}/CMake
-	${CMAKE_SOURCE_DIR}/CMake/TestingSuite
-	${CMAKE_SOURCE_DIR}/CMake/VersionSuite
-) 
+set(CMAKE_MODULE_PATH
+  ${CMAKE_SOURCE_DIR}/CMake
+  ${CMAKE_SOURCE_DIR}/CMake/TestingSuite
+  ${CMAKE_SOURCE_DIR}/CMake/VersionSuite)
 
+# RPath
+set(CMAKE_SKIP_BUILD_RPATH  FALSE)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 # Should we build with documentation
 option(XDMF_BUILD_DOCUMENTATION OFF)
 if(XDMF_BUILD_DOCUMENTATION)
-	add_subdirectory(doc)
+  add_subdirectory(doc)
 endif(XDMF_BUILD_DOCUMENTATION)
 
 option(XDMF_BUILD_TESTING ON)
 if(XDMF_BUILD_TESTING)
-    enable_testing()
-    include(CTest)
+  enable_testing()
+  include(CTest)
 endif(XDMF_BUILD_TESTING)
 
 # Wrapper Setup
@@ -33,129 +34,129 @@ option(XDMF_WRAP_JAVA OFF)
 
 # If we are wrapping either, we need swig
 if(XDMF_WRAP_PYTHON OR XDMF_WRAP_JAVA)
-	find_package(SWIG REQUIRED)
-	include(${SWIG_USE_FILE})
-	if(${SWIG_VERSION} LESS 2.0.0)
-		message(SEND_ERROR "Swig must be version 2.0.0 or greater")
-	endif(${SWIG_VERSION} LESS 2.0.0)
+  find_package(SWIG REQUIRED)
+  include(${SWIG_USE_FILE})
+  if(${SWIG_VERSION} LESS 2.0.0)
+    message(SEND_ERROR "Swig must be version 2.0.0 or greater")
+  endif(${SWIG_VERSION} LESS 2.0.0)
 endif(XDMF_WRAP_PYTHON OR XDMF_WRAP_JAVA)
 
 # If we are wrapping python, let's include it in the top level
 if(XDMF_WRAP_PYTHON)
-	find_package(PythonInterp REQUIRED)
-	find_package(PythonLibs REQUIRED)
-	include_directories(${PYTHON_INCLUDE_DIRS})
-
-	# A macro to swig and create the python files
-	# Since we essentually do the same thing inside and outside core, it
-	# would be easier as a macro
-	# Parameters:
-	#	python_name = the name of the intended target to be wrapped
-	#	${ARGN} = any dependencies needed by the target
-	# Output:
-	#	Target Name = the output target name will have ${python_name} as its name
-	MACRO(XDMF_SWIG_PYTHON python_name)
-		set(CMAKE_SWIG_OUTDIR ${CMAKE_BINARY_DIR})
-		set(CMAKE_SWIG_FLAGS "")
-		set_source_files_properties(${python_name}.i PROPERTIES CPLUSPLUS ON)
-		swig_add_module(${python_name} python ${python_name}.i)
-		swig_link_libraries(${python_name} ${python_name} ${PYTHON_LIBRARIES})
-		set_property(DIRECTORY APPEND PROPERTY
-			ADDITIONAL_MAKE_CLEAN_FILES
-			${CMAKE_BINARY_DIR}/${python_name}.pyc
-		)	
-		if("${ARGN}" STRGREATER "")
-			add_dependencies(${python_name} "${ARGN}")
-		endif("${ARGN}" STRGREATER "")
-
-        if(WIN32)
-            set_target_properties(${SWIG_MODULE_${python_name}_REAL_NAME}
-PROPERTIES 
-                    PREFIX ../
-                    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
-                    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
-                    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
-            )
-        endif(WIN32)
-
-		install(FILES ${CMAKE_BINARY_DIR}/${python_name}.py 
-                DESTINATION lib/python)
-		install(TARGETS ${SWIG_MODULE_${python_name}_REAL_NAME} 
-                DESTINATION lib/python)
-	ENDMACRO(XDMF_SWIG_PYTHON)
+  find_package(PythonInterp REQUIRED)
+  find_package(PythonLibs REQUIRED)
+  include_directories(${PYTHON_INCLUDE_DIRS})
+
+  # A macro to swig and create the python files
+  # Since we essentually do the same thing inside and outside core, it
+  # would be easier as a macro
+  # Parameters:
+  #     python_name = the name of the intended target to be wrapped
+  #     ${ARGN} = any dependencies needed by the target
+  # Output:
+  #     Target Name = the output target name will have ${python_name}
+  #                   as its name
+  MACRO(XDMF_SWIG_PYTHON python_name)
+    set(CMAKE_SWIG_OUTDIR ${CMAKE_BINARY_DIR})
+    set(CMAKE_SWIG_FLAGS "")
+    set_source_files_properties(${python_name}.i PROPERTIES CPLUSPLUS ON)
+    swig_add_module(${python_name} python ${python_name}.i)
+    swig_link_libraries(${python_name} ${python_name} ${PYTHON_LIBRARIES})
+    set_property(DIRECTORY APPEND PROPERTY
+      ADDITIONAL_MAKE_CLEAN_FILES
+      ${CMAKE_BINARY_DIR}/${python_name}.pyc)
+
+    if("${ARGN}" STRGREATER "")
+      add_dependencies(${python_name} "${ARGN}")
+    endif("${ARGN}" STRGREATER "")
+
+    if(WIN32)
+      set_target_properties(${SWIG_MODULE_${python_name}_REAL_NAME}
+        PROPERTIES
+        PREFIX ../
+        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+        LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+        ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+    endif(WIN32)
+
+    install(FILES ${CMAKE_BINARY_DIR}/${python_name}.py
+      DESTINATION lib/python)
+    install(TARGETS ${SWIG_MODULE_${python_name}_REAL_NAME}
+      DESTINATION lib/python)
+  ENDMACRO(XDMF_SWIG_PYTHON)
 endif(XDMF_WRAP_PYTHON)
 
 # If we are wrapping java, let's include it in the top level
 if(XDMF_WRAP_JAVA)
-	find_package(Java REQUIRED)
-	find_package(JNI REQUIRED)
-	include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-
-	# A macro to swig and create the jar files
-	# Since we essentually do the same thing inside and outside core, it
-	# would be easier as a macro
-	# Parameters:
-	#	java_name = the name of the intended target to be wrapped
-	#	${ARGN} = any dependencies needed by the target
-	# Output:
-	#	Target Name	= the output target name will have ${java_name}Java as its name
-	#	Target Jar	= the output target jar will have ${java_name}Java.jar as its name
-	MACRO(XDMF_SWIG_JAVA java_name)
-		set(${java_name}_JAVA_JAR ${CMAKE_BINARY_DIR}/${java_name}.jar)
-        set(XDMF_JAVA_PACKAGE_DIR mil/army/arl/xdmf)
-		set(XDMF_JAVA_DIR ${CMAKE_CURRENT_BINARY_DIR}/${XDMF_JAVA_PACKAGE_DIR})
-		set(CMAKE_SWIG_OUTDIR ${XDMF_JAVA_DIR})
-		set(CMAKE_SWIG_FLAGS -v -make_default -package mil.army.arl.xdmf)
-		set_source_files_properties(${java_name}.i PROPERTIES CPLUSPLUS ON)
-		swig_add_module(${java_name}Java java ${java_name}.i)
-		swig_link_libraries(${java_name}Java ${java_name})	
-
-        if(WIN32)
-            set_target_properties(${SWIG_MODULE_${java_name}Java_REAL_NAME} 
-                PROPERTIES 
-                    PREFIX ../
-                    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
-                    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
-                    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
-            )
-            set(java_compile_args -cp "${CMAKE_BINARY_DIR}/*.jar" *.java)
-            set(java_dest "bin")
-        else(WIN32)
-            set(java_compile_args -cp "${CMAKE_BINARY_DIR}/*.jar" ${XDMF_JAVA_DIR}/*.java)
-            set(java_dest "lib/java")
-        endif(WIN32)
-
-        add_custom_target(${java_name}_Java_Dir ALL DEPENDS 
-                            ${XDMF_JAVA_DIR})
-        add_custom_command(OUTPUT ${XDMF_JAVA_DIR}
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${XDMF_JAVA_DIR}
-        )
-        add_custom_target(Compiled_${java_name}_Jar ALL DEPENDS 
-                            ${${java_name}_JAVA_JAR})
-        add_custom_command(OUTPUT ${${java_name}_JAVA_JAR}
-            COMMAND ${CMAKE_COMMAND} -E chdir ${XDMF_JAVA_PACKAGE_DIR} 
-                ${JAVA_COMPILE} ARGS ${java_compile_args}
-            COMMAND ${JAVA_ARCHIVE}
-            ARGS    -cvf ${${java_name}_JAVA_JAR}
-                    "${XDMF_JAVA_PACKAGE_DIR}/*.class"
-        )
-        add_dependencies(${java_name}Java ${java_name}_Java_Dir)
-        add_dependencies(Compiled_${java_name}_Jar ${java_name}Java)
-
-        if(NOT ${ARGN} EQUAL "")
-            add_dependencies(Compiled_${java_name}_Jar "${ARGN}")
-        endif(NOT ${ARGN} EQUAL "")
-
-		set_property(DIRECTORY APPEND PROPERTY
-			ADDITIONAL_MAKE_CLEAN_FILES
-			${CMAKE_BINARY_DIR}/${java_name}.jar
-			${XDMF_JAVA_DIR}
-		)
-        install(FILES ${CMAKE_BINARY_DIR}/${java_name}.jar 
-                DESTINATION lib/java)
-       	install(TARGETS ${SWIG_MODULE_${java_name}Java_REAL_NAME}
-                DESTINATION ${java_dest})
-	ENDMACRO(XDMF_SWIG_JAVA)
+  find_package(Java REQUIRED)
+  find_package(JNI REQUIRED)
+  include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+    ${JAVA_INCLUDE_PATH}
+    ${JAVA_INCLUDE_PATH2})
+
+  # A macro to swig and create the jar files
+  # Since we essentually do the same thing inside and outside core, it
+  # would be easier as a macro
+  # Parameters:
+  #     java_name = the name of the intended target to be wrapped
+  #     ${ARGN} = any dependencies needed by the target
+  # Output:
+  #     Target Name = the output target name will have
+  #                   ${java_name}Java as its name
+  #     Target Jar = the output target jar will have
+  #                  ${java_name}Java.jar as its name
+  MACRO(XDMF_SWIG_JAVA java_name)
+    set(${java_name}_JAVA_JAR ${CMAKE_BINARY_DIR}/${java_name}.jar)
+    set(XDMF_JAVA_PACKAGE_DIR mil/army/arl/xdmf)
+    set(XDMF_JAVA_DIR ${CMAKE_CURRENT_BINARY_DIR}/${XDMF_JAVA_PACKAGE_DIR})
+    set(CMAKE_SWIG_OUTDIR ${XDMF_JAVA_DIR})
+    set(CMAKE_SWIG_FLAGS -v -make_default -package mil.army.arl.xdmf)
+    set_source_files_properties(${java_name}.i PROPERTIES CPLUSPLUS ON)
+    swig_add_module(${java_name}Java java ${java_name}.i)
+    swig_link_libraries(${java_name}Java ${java_name})
+
+    if(WIN32)
+      set_target_properties(${SWIG_MODULE_${java_name}Java_REAL_NAME}
+        PROPERTIES
+        PREFIX ../
+        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+        LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+        ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+      set(java_compile_args -cp "${CMAKE_BINARY_DIR}/*.jar" *.java)
+      set(java_dest "bin")
+    else(WIN32)
+      set(java_compile_args -cp "${CMAKE_BINARY_DIR}/*.jar"
+        ${XDMF_JAVA_DIR}/*.java)
+      set(java_dest "lib/java")
+    endif(WIN32)
+
+    add_custom_target(${java_name}_Java_Dir ALL DEPENDS ${XDMF_JAVA_DIR})
+    add_custom_command(OUTPUT ${XDMF_JAVA_DIR}
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${XDMF_JAVA_DIR})
+    add_custom_target(Compiled_${java_name}_Jar ALL DEPENDS
+      ${${java_name}_JAVA_JAR})
+    add_custom_command(OUTPUT ${${java_name}_JAVA_JAR}
+      COMMAND ${CMAKE_COMMAND} -E chdir ${XDMF_JAVA_PACKAGE_DIR}
+      ${JAVA_COMPILE} ARGS ${java_compile_args}
+      COMMAND ${JAVA_ARCHIVE}
+      ARGS    -cvf ${${java_name}_JAVA_JAR}
+      "${XDMF_JAVA_PACKAGE_DIR}/*.class")
+    add_dependencies(${java_name}Java ${java_name}_Java_Dir)
+    add_dependencies(Compiled_${java_name}_Jar ${java_name}Java)
+
+    if(NOT ${ARGN} EQUAL "")
+      add_dependencies(Compiled_${java_name}_Jar "${ARGN}")
+    endif(NOT ${ARGN} EQUAL "")
+
+    set_property(DIRECTORY APPEND PROPERTY
+      ADDITIONAL_MAKE_CLEAN_FILES
+      ${CMAKE_BINARY_DIR}/${java_name}.jar
+      ${XDMF_JAVA_DIR})
+    install(FILES ${CMAKE_BINARY_DIR}/${java_name}.jar
+      DESTINATION lib/java)
+    install(TARGETS ${SWIG_MODULE_${java_name}Java_REAL_NAME}
+      DESTINATION ${java_dest})
+  ENDMACRO(XDMF_SWIG_JAVA)
 endif(XDMF_WRAP_JAVA)
 
 add_subdirectory(core)
@@ -163,64 +164,63 @@ include_directories(${XdmfCore_INCLUDE_DIRS})
 
 option(XDMF_BUILD_CORE_ONLY OFF)
 if(NOT XDMF_BUILD_CORE_ONLY)
-	set(XdmfSources
-		XdmfAttribute
-		XdmfAttributeCenter
-		XdmfAttributeType
-		XdmfCurvilinearGrid
-		XdmfDomain
-		XdmfGeometry
-		XdmfGeometryType
-		XdmfGrid
-		XdmfGridCollection
-		XdmfGridCollectionType
-		XdmfItemFactory
-		XdmfMap
-		XdmfReader
-		XdmfRectilinearGrid
-		XdmfRegularGrid
-		XdmfSet
-		XdmfSetType
-		XdmfTime
-		XdmfTopology
-		XdmfTopologyType
-		XdmfUnstructuredGrid
-	)
-	
-	add_library(Xdmf ${XdmfSources})
-	target_link_libraries(Xdmf XdmfCore)
-
-    if(WIN32)
-        set_target_properties(Xdmf PROPERTIES 
-                DEFINE_SYMBOL Xdmf_EXPORTS
-                PREFIX ../
-                RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
-                LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
-                ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-    endif(WIN32)
-	
-	if(XDMF_WRAP_JAVA)
-		XDMF_SWIG_JAVA(Xdmf Compiled_XdmfCore_Jar)
-	endif(XDMF_WRAP_JAVA)
-	
-	if(XDMF_WRAP_PYTHON)
-		XDMF_SWIG_PYTHON(Xdmf XdmfCore)
-	endif(XDMF_WRAP_PYTHON)
-	
-	if(BUILD_TESTING)
-		add_subdirectory(tests)
-	endif(BUILD_TESTING)
-	
-	option(XDMF_BUILD_UTILS OFF)
-	if(XDMF_BUILD_UTILS)
-		add_subdirectory(utils)
-	endif(XDMF_BUILD_UTILS)
-		
-	file(GLOB XdmfHeaders "*.hpp" "*.tpp" "*.i" "CMake/VersionSuite/*.hpp")
-	install(FILES ${XdmfHeaders} DESTINATION include)
-    install(TARGETS Xdmf 
-        RUNTIME DESTINATION bin
-        LIBRARY DESTINATION lib
-        ARCHIVE DESTINATION lib
-    )
+  set(XdmfSources
+    XdmfAttribute
+    XdmfAttributeCenter
+    XdmfAttributeType
+    XdmfCurvilinearGrid
+    XdmfDomain
+    XdmfGeometry
+    XdmfGeometryType
+    XdmfGrid
+    XdmfGridCollection
+    XdmfGridCollectionType
+    XdmfItemFactory
+    XdmfMap
+    XdmfReader
+    XdmfRectilinearGrid
+    XdmfRegularGrid
+    XdmfSet
+    XdmfSetType
+    XdmfTime
+    XdmfTopology
+    XdmfTopologyType
+    XdmfUnstructuredGrid)
+
+  add_library(Xdmf ${XdmfSources})
+  target_link_libraries(Xdmf XdmfCore)
+
+  if(WIN32)
+    set_target_properties(Xdmf PROPERTIES
+      DEFINE_SYMBOL Xdmf_EXPORTS
+      PREFIX ../
+      RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+      LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+      ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+  endif(WIN32)
+
+  if(XDMF_WRAP_JAVA)
+    XDMF_SWIG_JAVA(Xdmf Compiled_XdmfCore_Jar)
+  endif(XDMF_WRAP_JAVA)
+
+  if(XDMF_WRAP_PYTHON)
+    XDMF_SWIG_PYTHON(Xdmf XdmfCore)
+  endif(XDMF_WRAP_PYTHON)
+
+  if(BUILD_TESTING)
+    add_subdirectory(tests)
+  endif(BUILD_TESTING)
+
+  option(XDMF_BUILD_UTILS OFF)
+  if(XDMF_BUILD_UTILS)
+    add_subdirectory(utils)
+  endif(XDMF_BUILD_UTILS)
+
+  file(GLOB XdmfHeaders "*.hpp" "*.tpp" "*.i" "CMake/VersionSuite/*.hpp")
+  install(FILES ${XdmfHeaders} DESTINATION include)
+  install(TARGETS Xdmf
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib)
 endif(NOT XDMF_BUILD_CORE_ONLY)
+

Xdmf.hpp

 #ifndef _XDMF_HPP
 #define _XDMF_HPP
-	/* Keep all our Win32 Conversions here */
-	#ifdef _WIN32
-		/* Used to export/import from the dlls */
-		#undef XDMFCORE_EXPORT
-		#define XDMFCORE_EXPORT __declspec(dllimport) 
-		#undef XDMFCORE_TEMPLATE
-		#define XDMFCORE_TEMPLATE extern
-		
-		#ifdef Xdmf_EXPORTS 
-			#define XDMF_EXPORT __declspec(dllexport)
-			#define XDMF_TEMPLATE
-		#else /* Xdmf_EXPORTS */
-			#define XDMF_EXPORT __declspec(dllimport)
-			#define XDMF_TEMPLATE extern
-		#endif /* Xdmf_EXPORTS */
-		
-		/* Compiler Warnings */
-		#ifndef XDMF_DEBUG
-			#pragma warning( disable : 4231 ) /* nonstandard extension used : 'extern' before template explicit instantiation */
-			#pragma warning( disable : 4251 ) /* needs to have dll-interface to be used by clients (Most of these guys are in private */
-			#pragma warning( disable : 4275 ) /* non dll-interface class 'std::_Container_base_aux' used as base for dll-interface class */
-			#pragma warning( disable : 4373 ) /* virtual function overrides,  parameters only differed by const/volatile qualifiers */
-			#pragma warning( disable : 4748 ) /* /GS can not protect parameters and local variables from local buffer overrun (turned off op)*/
-		#endif /* XDMF_DEBUG */
-		
-		/* Compiler Optimizations will result in an 'internal compiler error', so turn them off */
-		#pragma optimize("g", off)
+/* Keep all our Win32 Conversions here */
+#ifdef _WIN32
+/* Used to export/import from the dlls */
+#undef XDMFCORE_EXPORT
+#define XDMFCORE_EXPORT __declspec(dllimport)
+#undef XDMFCORE_TEMPLATE
+#define XDMFCORE_TEMPLATE extern
 
-	#else /* _WIN32 */
-		/* We don't need to export/import since there are no dlls */
-        #define XDMFCORE_EXPORT
-		#define XDMF_EXPORT
-        #define XDMFCORE_TEMPLATE
-		#define XDMF_TEMPLATE
-	#endif /* _WIN32 */
+#ifdef Xdmf_EXPORTS
+#define XDMF_EXPORT __declspec(dllexport)
+#define XDMF_TEMPLATE
+#else /* Xdmf_EXPORTS */
+#define XDMF_EXPORT __declspec(dllimport)
+#define XDMF_TEMPLATE extern
+#endif /* Xdmf_EXPORTS */
+
+/* Compiler Warnings */
+#ifndef XDMF_DEBUG
+#pragma warning( disable : 4231 ) /* nonstandard extension used : 'extern' before template explicit instantiation */
+#pragma warning( disable : 4251 ) /* needs to have dll-interface to be used by clients (Most of these guys are in private */
+#pragma warning( disable : 4275 ) /* non dll-interface class 'std::_Container_base_aux' used as base for dll-interface class */
+#pragma warning( disable : 4373 ) /* virtual function overrides,  parameters only differed by const/volatile qualifiers */
+#pragma warning( disable : 4748 ) /* /GS can not protect parameters and local variables from local buffer overrun (turned off op)*/
+#endif /* XDMF_DEBUG */
+
+/* Compiler Optimizations will result in an 'internal compiler error', so turn them off */
+#pragma optimize("g", off)
+
+#else /* _WIN32 */
+/* We don't need to export/import since there are no dlls */
+#define XDMFCORE_EXPORT
+#define XDMF_EXPORT
+#define XDMFCORE_TEMPLATE
+#define XDMF_TEMPLATE
+#endif /* _WIN32 */
 #endif /* _XDMF_HPP */
 

Xdmf.i

@@ -5,50 +5,50 @@ swig -v -c++ -python -o XdmfPython.cpp Xdmf.i
 
 %module Xdmf
 %{
-    #include <Xdmf.hpp>
-	
+
     // XdmfCore Includes
-	#include <XdmfArray.hpp>
-	#include <XdmfArrayType.hpp>
-	#include <XdmfCoreItemFactory.hpp>
-	#include <XdmfCoreReader.hpp>
-	#include <XdmfHDF5Controller.hpp>
-	#include <XdmfHDF5Writer.hpp>
+    #include <Xdmf.hpp>
+    #include <XdmfArray.hpp>
+    #include <XdmfArrayType.hpp>
+    #include <XdmfCoreItemFactory.hpp>
+    #include <XdmfCoreReader.hpp>
+    #include <XdmfHDF5Controller.hpp>
+    #include <XdmfHDF5Writer.hpp>
 #ifdef XDMF_BUILD_DSM
-	#include <XdmfHDF5ControllerDSM.hpp>
-	#include <XdmfHDF5WriterDSM.hpp>
+    #include <XdmfHDF5ControllerDSM.hpp>
+    #include <XdmfHDF5WriterDSM.hpp>
 #endif
-	#include <XdmfHeavyDataController.hpp>
-	#include <XdmfHeavyDataWriter.hpp>
-	#include <XdmfInformation.hpp>
-	#include <XdmfItem.hpp>
-	#include <XdmfItemProperty.hpp>
-	#include <XdmfSystemUtils.hpp>
-	#include <XdmfVisitor.hpp>
-	#include <XdmfWriter.hpp>
+    #include <XdmfHeavyDataController.hpp>
+    #include <XdmfHeavyDataWriter.hpp>
+    #include <XdmfInformation.hpp>
+    #include <XdmfItem.hpp>
+    #include <XdmfItemProperty.hpp>
+    #include <XdmfSystemUtils.hpp>
+    #include <XdmfVisitor.hpp>
+    #include <XdmfWriter.hpp>
 
-	// Xdmf Includes
-	#include <XdmfAttribute.hpp>
-	#include <XdmfAttributeCenter.hpp>
-	#include <XdmfAttributeType.hpp>
-	#include <XdmfCurvilinearGrid.hpp>
-	#include <XdmfDomain.hpp>
-	#include <XdmfGeometry.hpp>
-	#include <XdmfGeometryType.hpp>
-	#include <XdmfGrid.hpp>
-	#include <XdmfGridCollection.hpp>
-	#include <XdmfGridCollectionType.hpp>
-	#include <XdmfItemFactory.hpp>
-	#include <XdmfMap.hpp>
-	#include <XdmfReader.hpp>
-	#include <XdmfRectilinearGrid.hpp>
-	#include <XdmfRegularGrid.hpp>
-	#include <XdmfSet.hpp>
-	#include <XdmfSetType.hpp>
-	#include <XdmfTime.hpp>
-	#include <XdmfTopology.hpp>
-	#include <XdmfTopologyType.hpp>
-	#include <XdmfUnstructuredGrid.hpp>
+    // Xdmf Includes
+    #include <XdmfAttribute.hpp>
+    #include <XdmfAttributeCenter.hpp>
+    #include <XdmfAttributeType.hpp>
+    #include <XdmfCurvilinearGrid.hpp>
+    #include <XdmfDomain.hpp>
+    #include <XdmfGeometry.hpp>
+    #include <XdmfGeometryType.hpp>
+    #include <XdmfGrid.hpp>
+    #include <XdmfGridCollection.hpp>
+    #include <XdmfGridCollectionType.hpp>
+    #include <XdmfItemFactory.hpp>
+    #include <XdmfMap.hpp>
+    #include <XdmfReader.hpp>
+    #include <XdmfRectilinearGrid.hpp>
+    #include <XdmfRegularGrid.hpp>
+    #include <XdmfSet.hpp>
+    #include <XdmfSetType.hpp>
+    #include <XdmfTime.hpp>
+    #include <XdmfTopology.hpp>
+    #include <XdmfTopologyType.hpp>
+    #include <XdmfUnstructuredGrid.hpp>
 %}
 
 %import XdmfCore.i
@@ -58,58 +58,45 @@ swig -v -c++ -python -o XdmfPython.cpp Xdmf.i
 // Typemaps that work for Java
 
 %typemap(out)  boost::shared_ptr<XdmfItem> {
-	if(boost::shared_ptr<XdmfAttribute> value = boost::shared_dynamic_cast<XdmfAttribute>($1))
-	{
-		*(boost::shared_ptr< XdmfAttribute > **)&($result) = value ? new boost::shared_ptr< XdmfAttribute >(value) : 0;
-	}
-	else if(boost::shared_ptr<XdmfCurvilinearGrid> value = boost::shared_dynamic_cast<XdmfCurvilinearGrid>($1))
-	{
-		*(boost::shared_ptr< XdmfCurvilinearGrid