The branch, build-main has been updated via 920705cf70d4a230c7d75fbd869e2cef162cf062 (commit) from 92239dafb601d2ee5da1554d19631267c81fe57c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: nxcomp/BlockCacheSet.cpp | 2 +- nxcomp/CHANGELOG | 4 ++++ nxcomp/Loop.cpp | 3 ++- nxcomp/Message.cpp | 3 ++- nxcomp/Misc.cpp | 1 - nxcomp/Misc.h | 6 ++++-- nxcomp/Proxy.cpp | 3 ++- nxcomp/Split.cpp | 3 ++- 8 files changed, 17 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/nxcomp/BlockCacheSet.cpp b/nxcomp/BlockCacheSet.cpp index f6591d5..23bc1fa 100755 --- a/nxcomp/BlockCacheSet.cpp +++ b/nxcomp/BlockCacheSet.cpp @@ -15,7 +15,7 @@ /* */ /**************************************************************************/ -#include <iostream.h> +#include "Misc.h" #include "BlockCacheSet.h" diff --git a/nxcomp/CHANGELOG b/nxcomp/CHANGELOG index cceeb07..6a26f66 100755 --- a/nxcomp/CHANGELOG +++ b/nxcomp/CHANGELOG @@ -1,5 +1,9 @@ ChangeLog: +nxcomp-3.2.0-7 + +- Solved a compilation problem on GCC 4.3. + nxcomp-3.2.0-6 - Changes considering that unsetenv() returns void on Mac OS X. diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp index 9992a77..62e868b 100755 --- a/nxcomp/Loop.cpp +++ b/nxcomp/Loop.cpp @@ -29,7 +29,6 @@ #include <dirent.h> #include <pwd.h> -#include <fstream.h> #include <fcntl.h> #include <sys/types.h> @@ -42,6 +41,8 @@ #include <netinet/in.h> #include <arpa/inet.h> +#include "Misc.h" + #ifdef __sun #include <strings.h> #endif diff --git a/nxcomp/Message.cpp b/nxcomp/Message.cpp index 1bf074e..2d8e784 100755 --- a/nxcomp/Message.cpp +++ b/nxcomp/Message.cpp @@ -16,12 +16,13 @@ /**************************************************************************/ #include <stdio.h> -#include <fstream.h> #include <unistd.h> #include <string.h> #include <algorithm> +#include "Misc.h" + // // We need channel's cache data. // diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp index 2f58bdf..775f53a 100755 --- a/nxcomp/Misc.cpp +++ b/nxcomp/Misc.cpp @@ -15,7 +15,6 @@ /* */ /**************************************************************************/ -#include <iostream.h> #include <stdio.h> #include <ctype.h> #include <stdlib.h> diff --git a/nxcomp/Misc.h b/nxcomp/Misc.h index f26c56f..23058b7 100755 --- a/nxcomp/Misc.h +++ b/nxcomp/Misc.h @@ -18,12 +18,14 @@ #ifndef Misc_H #define Misc_H -#include <iostream.h> -#include <fstream.h> +#include <iostream> +#include <fstream> #include <errno.h> #include <string.h> +using namespace std; + // // This is MD5 length. // diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp index 54a5af4..7965683 100755 --- a/nxcomp/Proxy.cpp +++ b/nxcomp/Proxy.cpp @@ -18,10 +18,11 @@ #include <stdio.h> #include <unistd.h> #include <stdlib.h> -#include <fstream.h> #include <sys/types.h> #include <sys/stat.h> +#include "Misc.h" + #if defined(__CYGWIN32__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun) #include <netinet/in_systm.h> #endif diff --git a/nxcomp/Split.cpp b/nxcomp/Split.cpp index 38cfb4b..7a3fe2c 100755 --- a/nxcomp/Split.cpp +++ b/nxcomp/Split.cpp @@ -15,13 +15,14 @@ /* */ /**************************************************************************/ -#include <fstream.h> #include <unistd.h> #include <string.h> #include <sys/stat.h> #include <sys/types.h> #include <utime.h> +#include "Misc.h" + #include "Split.h" #include "Control.h" hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).