Skip to content

Minor fixes to remove compilation warnings and errors. #10

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

Open
jteg68 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Minor fixes to remove compilation warnings and errors. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions nudg++/trunk/Include/IndexSort_Type.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ void MLIndex_sort<T>::reverse_slice(T *lo, T *hi)
template <typename T>
void MLIndex_sort<T>::binarysort(T *lo, T *hi, T *start)
{
register T *l, *p, *r;
register T pivot;
T *l, *p, *r;
T pivot;

if (lo == start)
++start;
Expand Down
4 changes: 2 additions & 2 deletions nudg++/trunk/Include/LOG_funcs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ void umLOG(const std::string& msg, int n=0);
void umMSG(const std::string& msg, int n=0);
void umTRC(const std::string& msg, int n=0);

void umWARNING(char* function_name, ...);
void umERROR(char* function_name, ...);
void umWARNING(const char* function_name, ...);
void umERROR(const char* function_name, ...);
void umQUIT();

char* umOFORM(const char* fmt, ...);
Expand Down
4 changes: 2 additions & 2 deletions nudg++/trunk/Include/Mat_COL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ bool Mat_COL<T>::resize(int M, int N, bool bInit, T x)
this->destroy(); // clear allocation, zero all members
if ((M>0) && (N>0))
{
initialize(M*N, bInit, x);
this->initialize(M*N, bInit, x);
set_pointers(M, N);
}
}
Expand Down Expand Up @@ -862,7 +862,7 @@ bool Mat_COL<T>::reshape(int newM, int newN, bool bInit, T x)
return false; // no change
}
if (newM*newN != m_M*m_N) {
extend(newM*newN,bInit,x); // expand or contract
this->extend(newM*newN,bInit,x); // expand or contract
}
set_pointers(newM, newN); // adjust logical indexing
return true; // shape has changed
Expand Down
Loading