Skip to content

Add configuration for building on Ubuntu 22.04 #2485

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.

Sign up for GitHub

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
WhoBrokeTheBuild merged 2 commits into from
Aug 25, 2022
Merged

Add configuration for building on Ubuntu 22.04 #2485

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75619ac
Add configuration for building on Ubuntu 22.04
WhoBrokeTheBuild Aug 24, 2022
3711561
Add Ubuntu22 to linux.xml
WhoBrokeTheBuild Aug 25, 2022
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
1 change: 1 addition & 0 deletions deploy/os/ubuntu22.opts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--platform=debian --valgrind=memcheck,helgrind --dockerimage=mdsplus/builder:ubuntu22-64 --distname=Ubuntu22 --arch=amd64
8 changes: 4 additions & 4 deletions mdsobjects/cpp/mdsipobjects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using namespace MDSplus;
using namespace std;

extern "C" void *getManyObj(char *serializedIn) throw(MdsException);
extern "C" void *putManyObj(char *serializedIn) throw(MdsException);
extern "C" void *getManyObj(char *serializedIn);
extern "C" void *putManyObj(char *serializedIn);
extern "C" void *compileFromExprWithArgs(char *expr, int nArgs, void *args,
void *tree);
extern "C" int SendArg(int sock, unsigned char idx, char dtype,
Expand Down Expand Up @@ -108,7 +108,7 @@ static int convertType(int mdsType)
}
}

void *getManyObj(char *serializedIn) throw(MdsException)
void *getManyObj(char *serializedIn)
{
AutoData<List> inArgs((List *)deserialize((const char *)serializedIn));
if (inArgs->clazz != CLASS_APD) // || inArgs->dtype != DTYPE_LIST)
Expand Down Expand Up @@ -241,7 +241,7 @@ void *getManyObj(char *serializedIn) throw(MdsException)
return result->convertToDsc();
}

void *putManyObj(char *serializedIn) throw(MdsException)
void *putManyObj(char *serializedIn)
{
AutoData<List> inArgs((List *)deserialize((const char *)serializedIn));
if (inArgs->clazz != CLASS_APD) // || inArgs->dtype != DTYPE_LIST)
Expand Down
2 changes: 1 addition & 1 deletion mdstcpip/udt4/src/core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ void CUDT::connect(const sockaddr *serv_addr) {
}
#pragma GCC diagnostic pop

int CUDT::connect(const CPacket &response) throw() {
int CUDT::connect(const CPacket &response) {
// this is the 2nd half of a connection request. If the connection is setup
// successfully this returns 0. returning -1 means there is an error.
// returning 1 or 2 means the connection is in process and needs more
Expand Down
2 changes: 1 addition & 1 deletion mdstcpip/udt4/src/core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class CUDT {
// Return 0 if connected, positive value if connection is in progress,
// otherwise error code.

int connect(const CPacket &pkt) throw();
int connect(const CPacket &pkt);

// Functionality:
// Connect to a UDT entity listening at address "peer", which has sent "hs"
Expand Down
Loading