always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Python: Remove s/long long/long/ swig hack.

Browse Source
This commit is contained in:
Corentin Le Molgat
2020-02-12 16:09:42 +01:00
parent 548974902b
commit bc4bc0b042
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
makefiles/Makefile.python.mk
View File

@@ -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

2
ortools/base/base.i
View File

@@ -70,7 +70,7 @@ COPY_TYPEMAPS(uint64_t, uint64);
%include "exception.i"
#endif // SWIGPYTHON
#endif // SWIGPYTHON
#if defined(SWIGJAVA) || defined(SWIGCSHARP)