Skip to content

Fixing complex cone bug #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions cmake/scs_types.h.in
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
/*
* GENERATED BY CMAKE
*/

/*
* Public header including definitions of primitive types used in SCS.
* Make sure this file and `scs.h` are somewhere appropriate and then use
* `#include "scs.h"` to access the SCS public API.
*/

#ifndef SCS_TYPES_H_GUARD
#define SCS_TYPES_H_GUARD

#ifdef __cplusplus
extern "C" {
#endif

#include <complex.h>

typedef @SCS_INT_TYPE@ scs_int;
typedef @SCS_FLOAT_TYPE@ scs_float;
typedef @SCS_FLOAT_TYPE@ _Complex scs_complex_float;
typedef @SCS_INT_TYPE@ scs_int;
typedef @SCS_FLOAT_TYPE@ scs_float;
typedef @SCS_FLOAT_TYPE@ scs_complex_float[2]; /* [real, imaginary] */

#ifdef __cplusplus
}
Expand Down
6 changes: 2 additions & 4 deletions include/scs_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
extern "C" {
#endif

#include <complex.h>

#ifdef DLONG
/*#ifdef _WIN64
#include <stdint.h>
Expand All @@ -28,10 +26,10 @@ typedef int scs_int;

#ifndef SFLOAT
typedef double scs_float;
typedef double _Complex scs_complex_float;
typedef double scs_complex_float[2]; // [real, imaginary]
#else
typedef float scs_float;
typedef float _Complex scs_complex_float;
typedef float scs_complex_float[2]; // [real, imaginary]
#endif

#ifdef __cplusplus
Expand Down
Loading
Loading