Skip to content

Commit

Permalink
added some more bells and whistles to remove warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
echu committed May 23, 2014
1 parent db5f4a3 commit 81443bd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
language: python
python:
- "2.6"
- "2.7"
- "3.2"
- "3.3"
virtualenv:
system_site_packages: true
Expand All @@ -11,7 +13,7 @@ before_install:
# install dependencies
install:
- make test
- cd python; sudo python setup.py install
- cd python; sudo python setup.py install; cd ..
# command to run tests
script:
- ./ecostester
Expand Down
5 changes: 2 additions & 3 deletions external/ldl/include/ldl.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
* Stripped down by Alexander Domahidi, 2012.
*/

#include "SuiteSparse_config.h"

#include "../../include/glblopts.h"
#include "../../include/ecos.h"

#include "SuiteSparse_config.h"

#ifdef LDL_LONG
#define LDL_int SuiteSparse_long
#define LDL_ID SuiteSparse_long_id
Expand Down Expand Up @@ -96,4 +96,3 @@ void ldl_l_ltsolve (SuiteSparse_long n, double X [ ], SuiteSparse_long Lp [ ],
#define LDL_SUB_VERSION 1
#define LDL_SUBSUB_VERSION 0
#define LDL_VERSION LDL_VERSION_CODE(LDL_MAIN_VERSION,LDL_SUB_VERSION)

4 changes: 3 additions & 1 deletion python/ecosmodule.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
/* Check that we are clean against numpy 1.7 */
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION

#include <Python.h>
#include "ecos.h"
#include "numpy/arrayobject.h"

/*
* Define INLINE for MSVC compatibility.
*/
Expand Down

0 comments on commit 81443bd

Please sign in to comment.