From bc4bc0b0427d9753f1a09828dd83f2f2648d1e1b Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Wed, 12 Feb 2020 16:09:42 +0100 Subject: [PATCH] Python: Remove s/long long/long/ swig hack. --- makefiles/Makefile.python.mk | 10 ---------- ortools/base/base.i | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/makefiles/Makefile.python.mk b/makefiles/Makefile.python.mk index b143b35277..b91307a434 100755 --- a/makefiles/Makefile.python.mk +++ b/makefiles/Makefile.python.mk @@ -271,14 +271,6 @@ $(GEN_DIR)/ortools/constraint_solver/pywrapcp.py: \ -o $(GEN_PATH)$Sortools$Sconstraint_solver$Sconstraint_solver_python_wrap.cc \ -module pywrapcp \ $(SRC_DIR)/ortools/constraint_solver$Spython$Srouting.i - $(SED) -i -e 's/< long long >/< int64 >/g' \ - $(GEN_PATH)$Sortools$Sconstraint_solver$Sconstraint_solver_python_wrap.cc - $(SED) -i -e 's/< long long,long long >/< int64, int64 >/g' \ - $(GEN_PATH)$Sortools$Sconstraint_solver$Sconstraint_solver_python_wrap.cc - $(SED) -i -e 's/< long long,std::allocator/< int64, std::allocator/g' \ - $(GEN_PATH)$Sortools$Sconstraint_solver$Sconstraint_solver_python_wrap.cc - $(SED) -i -e 's/,long long,/,int64,/g' \ - $(GEN_PATH)$Sortools$Sconstraint_solver$Sconstraint_solver_python_wrap.cc $(GEN_DIR)/ortools/constraint_solver/constraint_solver_python_wrap.cc: \ $(GEN_DIR)/ortools/constraint_solver/pywrapcp.py @@ -492,8 +484,6 @@ $(GEN_DIR)/ortools/util/sorted_interval_list.py: \ -o $(GEN_PATH)$Sortools$Sutil$Ssorted_interval_list_python_wrap.cc \ -module sorted_interval_list \ $(SRC_DIR)$Sortools$Sutil$Spython$Ssorted_interval_list.i - $(SED) -i -e 's/< long long >/< int64 >/g' \ - $(GEN_PATH)$Sortools$Sutil$Ssorted_interval_list_python_wrap.cc $(GEN_DIR)/ortools/util/sorted_interval_list_python_wrap.cc: \ $(GEN_DIR)/ortools/util/sorted_interval_list.py diff --git a/ortools/base/base.i b/ortools/base/base.i index 834c34e645..41fe0a9725 100644 --- a/ortools/base/base.i +++ b/ortools/base/base.i @@ -70,7 +70,7 @@ COPY_TYPEMAPS(uint64_t, uint64); %include "exception.i" -#endif // SWIGPYTHON +#endif // SWIGPYTHON #if defined(SWIGJAVA) || defined(SWIGCSHARP)