Skip to content
Browse files

Move some header file includes into fragments for UTL languages

  • Loading branch information...
1 parent d55692c commit 0d9a8721f46a7ab0ca168edb97c410566ead026d @wsfulton wsfulton committed Feb 21, 2014
View
4 Lib/octave/octcontainer.swg
@@ -26,9 +26,7 @@
// The Octave C++ Wrap
-%insert(header) %{
-#include <stdexcept>
-%}
+%fragment("<stdexcept>");
%include <std_except.i>
View
4 Lib/perl5/std_list.i
@@ -36,9 +36,9 @@
%{
#include <list>
-#include <algorithm>
-#include <stdexcept>
%}
+%fragment("<algorithm>");
+%fragment("<stdexcept>");
// exported class
View
4 Lib/perl5/std_map.i
@@ -12,9 +12,9 @@
%{
#include <map>
-#include <algorithm>
-#include <stdexcept>
%}
+%fragment("<algorithm>");
+%fragment("<stdexcept>");
// exported class
View
4 Lib/perl5/std_vector.i
@@ -32,9 +32,9 @@
%{
#include <vector>
-#include <algorithm>
-#include <stdexcept>
%}
+%fragment("<algorithm>");
+%fragment("<stdexcept>");
// exported class
View
4 Lib/python/pycontainer.swg
@@ -32,9 +32,7 @@
/**** The PySequence C++ Wrap ***/
-%insert(header) %{
-#include <stdexcept>
-%}
+%fragment("<stdexcept>");
%include <std_except.i>
View
4 Lib/ruby/rubycontainer.swg
@@ -26,9 +26,7 @@
/**** The RubySequence C++ Wrap ***/
-%insert(header) %{
-#include <stdexcept>
-%}
+%fragment("<stdexcept>");
%include <std_except.i>
View
2 Lib/std/_std_deque.i
@@ -10,8 +10,8 @@
%{
#include <deque>
-#include <stdexcept>
%}
+%fragment("<stdexcept>");
/* This macro defines all of the standard methods for a deque. This
View
6 Lib/std/std_common.i
@@ -24,10 +24,8 @@
//
%fragment("<string>");
-%{
-#include <stdexcept>
-#include <stddef.h>
-%}
+%fragment("<stdexcept>");
+%fragment("<stddef.h>");
%fragment("StdIteratorTraits","header",fragment="<stddef.h>") %{
View
4 Lib/std/std_except.i
@@ -2,9 +2,7 @@
#error "do not use this version of std_except.i"
#endif
-%{
-#include <stdexcept>
-%}
+%fragment("<stdexcept>");
#if defined(SWIG_STD_EXCEPTIONS_AS_CLASSES)
View
4 Lib/std/std_map.i
@@ -57,9 +57,9 @@
%{
#include <map>
-#include <algorithm>
-#include <stdexcept>
%}
+%fragment("<algorithm>");
+%fragment("<stdexcept>");
// exported class
View
4 Lib/std/std_unordered_map.i
@@ -60,9 +60,9 @@
%{
#include <unordered_map>
-#include <algorithm>
-#include <stdexcept>
%}
+%fragment("<algorithm>");
+%fragment("<stdexcept>");
// exported class
View
4 Lib/tcl/std_map.i
@@ -13,9 +13,9 @@
%{
#include <map>
-#include <algorithm>
-#include <stdexcept>
%}
+%fragment("<algorithm>");
+%fragment("<stdexcept>");
// exported class
View
4 Lib/tcl/std_vector.i
@@ -29,10 +29,10 @@
// ------------------------------------------------------------------------
%fragment("<string>");
+%fragment("<stdexcept>");
+%fragment("<algorithm>");
%{
#include <vector>
-#include <algorithm>
-#include <stdexcept>
Tcl_Obj* SwigString_FromString(const std::string &s) {
return Tcl_NewStringObj(s.data(), (int)s.length());
View
6 Lib/typemaps/exception.swg
@@ -52,9 +52,9 @@
}
}
*/
-%{
-#include <stdexcept>
-%}
+
+%fragment("<stdexcept>");
+
%define SWIG_CATCH_STDEXCEPT
/* catching std::exception */
catch (std::invalid_argument& e) {
View
8 Lib/typemaps/fragments.swg
@@ -157,6 +157,14 @@
#include <string>
%}
+%fragment("<stdexcept>", "header") %{
+#include <stdexcept>
+%}
+
+%fragment("<algorithm>", "header") %{
+#include <algorithm>
+%}
+
%fragment("SWIG_isfinite","header",fragment="<math.h>,<float.h>") %{
/* Getting isfinite working pre C99 across multiple platforms is non-trivial. Users can provide SWIG_isfinite on older platforms. */
#ifndef SWIG_isfinite
View
4 Lib/typemaps/traits.swg
@@ -22,9 +22,7 @@
//
%fragment("<string>");
-%{
-#include <stdexcept>
-%}
+%fragment("<stdexcept>");
%fragment("Traits","header",fragment="<string>")
{

0 comments on commit 0d9a872

Please sign in to comment.
Something went wrong with that request. Please try again.