Attachment #50429 for bug #62378

Lines 15-21 Link Here

(-)nx-x11-1.4.0-r3/work/nxcomp/BlockCacheSet.cpp (-1 / +3 lines)
15	/* */	15	/* */
16	/**************************************************************************/	16	/**************************************************************************/
17		17
18	#include <iostream.h>	18	#include <iostream>
		19	using namespace std;
		20
19	#include "BlockCacheSet.h"	21	#include "BlockCacheSet.h"
20		22
21		23

Lines 452-458 Link Here

(-)nx-x11-1.4.0-r3/work/nxcomp/Jpeg.cpp (-2 / +2 lines)
452	// next line.	452	// next line.
453	//	453	//
454		454
455	(char ) pixelPtr += RoundUp4(w 2) - w * 2;	455	(char ) &pixelPtr += RoundUp4(w 2) - w * 2;
456		456
457	dy++;	457	dy++;
458	}	458	}
Lines 562-568 Link Here
562	pixelPtr += 3;	562	pixelPtr += 3;
563	}	563	}
564		564
565	(char ) pixelPtr += RoundUp4(w 3) - w * 3;	565	(char ) &pixelPtr += RoundUp4(w 3) - w * 3;
566		566
567	dy++;	567	dy++;
568	}	568	}

Lines 32-38 Link Here

(-)nx-x11-1.4.0-r3/work/nxcomp/Loop.cpp (-1 / +3 lines)
32	#include <strings.h>	32	#include <strings.h>
33	#endif	33	#endif
34		34
35	#include <fstream.h>	35	#include <fstream>
		36	using namespace std;
		37
36	#include <fcntl.h>	38	#include <fcntl.h>
37		39
38	#include <sys/types.h>	40	#include <sys/types.h>

Lines 12-18 Link Here

(-)nx-x11-1.4.0-r3/work/nxcomp/Makefile.in (-1 / +1 lines)
12		12
13	CXX = @CXX@	13	CXX = @CXX@
14	CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \	14	CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
15	-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes	15	-Wall -Wpointer-arith
16	CXXINCLUDES =	16	CXXINCLUDES =
17	CXXDEFINES =	17	CXXDEFINES =
18		18

Lines 16-22 Link Here

(-)nx-x11-1.4.0-r3/work/nxcomp/Message.cpp (-1 / +3 lines)
16	/**************************************************************************/	16	/**************************************************************************/
17		17
18	#include <stdio.h>	18	#include <stdio.h>
19	#include <fstream.h>	19	#include <fstream>
		20	using namespace std;
		21
20	#include <unistd.h>	22	#include <unistd.h>
21	#include <string.h>	23	#include <string.h>
22		24

Lines 15-21 Link Here

(-)nx-x11-1.4.0-r3/work/nxcomp/Misc.cpp (-1 / +3 lines)
15	/* */	15	/* */
16	/**************************************************************************/	16	/**************************************************************************/
17		17
18	#include <iostream.h>	18	#include <iostream>
		19	using namespace std;
		20
19	#include <stdio.h>	21	#include <stdio.h>
20	#include <ctype.h>	22	#include <ctype.h>
21	#include <stdlib.h>	23	#include <stdlib.h>

Lines 18-24 Link Here

(-)nx-x11-1.4.0-r3/work/nxcomp/Misc.h (-1 / +2 lines)
18	#ifndef Misc_H	18	#ifndef Misc_H
19	#define Misc_H	19	#define Misc_H
20		20
21	#include <iostream.h>	21	#include <iostream>
		22	using namespace std;
22		23
23	#include <errno.h>	24	#include <errno.h>
24	#include <string.h>	25	#include <string.h>

Lines 452-458 Link Here

(-)nx-x11-1.4.0-r3/work/nxcomp/Png.cpp (-2 / +2 lines)
452	// next line	452	// next line
453	//	453	//
454		454
455	(char ) pixelPtr += RoundUp4(w 2) - w * 2;	455	(char ) &pixelPtr += RoundUp4(w 2) - w * 2;
456	}	456	}
457		457
458	png_destroy_read_struct(&png_ptr, &info_ptr,NULL);	458	png_destroy_read_struct(&png_ptr, &info_ptr,NULL);
Lines 578-584 Link Here
578	pixelPtr += 3;	578	pixelPtr += 3;
579	}	579	}
580		580
581	(char ) pixelPtr += RoundUp4(w 3) - w * 3;	581	(char ) &pixelPtr += RoundUp4(w 3) - w * 3;
582	}	582	}
583		583
584	png_destroy_read_struct(&png_ptr, &info_ptr,NULL);	584	png_destroy_read_struct(&png_ptr, &info_ptr,NULL);

Lines 17-23 Link Here

(-)nx-x11-1.4.0-r3/work/nxcomp/Proxy.cpp (-1 / +3 lines)
17		17
18	#include <stdio.h>	18	#include <stdio.h>
19	#include <unistd.h>	19	#include <unistd.h>
20	#include <fstream.h>	20	#include <fstream>
		21	using namespace std;
		22
21	#include <sys/ioctl.h>	23	#include <sys/ioctl.h>
22	#include <sys/socket.h>	24	#include <sys/socket.h>
23		25

Lines 15-21 Link Here

(-)nx-x11-1.4.0-r3/work/nxcomp/Split.cpp (-1 / +3 lines)
15	/* */	15	/* */
16	/**************************************************************************/	16	/**************************************************************************/
17		17
18	#include <fstream.h>	18	#include <fstream>
		19	using namespace std;
		20
19	#include <unistd.h>	21	#include <unistd.h>
20	#include <string.h>	22	#include <string.h>
21	#include <sys/stat.h>	23	#include <sys/stat.h>




    return &*(vector < unsigned char >::begin());
  }

  /* clear function was broken, instead use STL's working std::vector<>::clear */
  {
    #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)

    #if defined(__GLIBCPP_INTERNAL_VECTOR_H)

    _Destroy(_M_start, _M_finish);

    #else

    destroy(_M_start, _M_finish);

    #endif

    _M_deallocate(_M_start, _M_end_of_storage - _M_start);

    _M_start = _M_finish = _M_end_of_storage = 0;

    #else

    destroy(start, finish);

    deallocate();

    start = finish = end_of_storage = 0;

    #endif
  }
};

class T_messages : public vector < Message * >
{
  public:

  /* clear function was broken, instead use STL's working std::vector<>::clear */
  {
    #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)

    #if defined(__GLIBCPP_INTERNAL_VECTOR_H)

    _Destroy(_M_start, _M_finish);

    #else

    destroy(_M_start, _M_finish);

    #endif

    _M_deallocate(_M_start, _M_end_of_storage - _M_start);

    _M_start = _M_finish = _M_end_of_storage = 0;

    #else

    destroy(start, finish);

    deallocate();

    start = finish = end_of_storage = 0;

    #endif
  }
};

struct T_less




ac_compiler_gnu=$ac_cv_cxx_compiler_gnu



echo "$as_me:$LINENO: checking whether compiler needs -Wno-deprecated" >&5
echo $ECHO_N "checking whether compiler needs -Wno-deprecated... $ECHO_C" >&6
gcc_version=`${CC} --version | grep 'gcc (GCC) 3.' | head -n 1`
case "${gcc_version}" in
     gcc*)
        echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
        CXXFLAGS="$CXXFLAGS -Wno-deprecated"
        CPPFLAGS="$CPPFLAGS -Wno-deprecated"
        ;;

     *)
        echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
        ;;
esac

echo "$as_me:$LINENO: checking whether compiler accepts -Wmissing-declarations and -Wnested-externs" >&5
echo $ECHO_N "checking whether compiler accepts -Wmissing-declarations and -Wnested-externs... $ECHO_C" >&6
gcc_version=`${CC} --version | grep 'gcc (GCC) 3.3.' | head -n 1`
case "${gcc_version}" in
     gcc*)
        echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
        ;;

     *)
        echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
        CXXFLAGS="$CXXFLAGS -Wmissing-declarations -Wnested-externs"
        CPPFLAGS="$CPPFLAGS -Wmissing-declarations -Wnested-externs"
        ;;
esac


ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
  if test -f $ac_dir/install-sh; then




AC_PROG_CC
AC_LANG_CPLUSPLUS

dnl Check whether option -Wno-deprecated
dnl is needed by GCC compiler.

AC_MSG_CHECKING([whether compiler needs -Wno-deprecated])
gcc_version=`${CC} --version | grep 'gcc (GCC) 3.' | head -n 1`
case "${gcc_version}" in
     gcc*)
        AC_MSG_RESULT([yes])
        CXXFLAGS="$CXXFLAGS -Wno-deprecated"
        CPPFLAGS="$CPPFLAGS -Wno-deprecated"
        ;;

     *)
        AC_MSG_RESULT([no])
        ;;
esac

AC_MSG_CHECKING([whether compiler accepts -Wmissing-declarations and -Wnested-externs])
gcc_version=`${CC} --version | grep 'gcc (GCC) 3.3.' | head -n 1`
case "${gcc_version}" in
     gcc*)
        AC_MSG_RESULT([no])
        ;;

     *)
        AC_MSG_RESULT([yes])
        CXXFLAGS="$CXXFLAGS -Wmissing-declarations -Wnested-externs"
        CPPFLAGS="$CPPFLAGS -Wmissing-declarations -Wnested-externs"
        ;;
esac

dnl Check for BSD compatible install.

AC_PROG_INSTALL

Return to bug 62378

Lines 72-139 Link Here

(-)nx-x11-1.4.0-r3/work/nxcomp/Types.h (-56 / +2 lines)
72	return &*(vector < unsigned char >::begin());	72	return &*(vector < unsigned char >::begin());
73	}	73	}
74		74
75	void clear()	75	/* clear function was broken, instead use STL's working std::vector<>::clear */
76	{
77	#if defined(__STL_USE_STD_ALLOCATORS) \|\| defined(__GLIBCPP_INTERNAL_VECTOR_H)
78
79	#if defined(__GLIBCPP_INTERNAL_VECTOR_H)
80
81	_Destroy(_M_start, _M_finish);
82
83	#else
84
85	destroy(_M_start, _M_finish);
86
87	#endif
88
89	_M_deallocate(_M_start, _M_end_of_storage - _M_start);
90
91	_M_start = _M_finish = _M_end_of_storage = 0;
92
93	#else
94
95	destroy(start, finish);
96
97	deallocate();
98
99	start = finish = end_of_storage = 0;
100
101	#endif
102	}
103	};	76	};
104		77
105	class T_messages : public vector < Message * >	78	class T_messages : public vector < Message * >
106	{	79	{
107	public:	80	public:
108		81
109	void clear()	82	/* clear function was broken, instead use STL's working std::vector<>::clear */
110	{
111	#if defined(__STL_USE_STD_ALLOCATORS) \|\| defined(__GLIBCPP_INTERNAL_VECTOR_H)
112
113	#if defined(__GLIBCPP_INTERNAL_VECTOR_H)
114
115	_Destroy(_M_start, _M_finish);
116
117	#else
118
119	destroy(_M_start, _M_finish);
120
121	#endif
122
123	_M_deallocate(_M_start, _M_end_of_storage - _M_start);
124
125	_M_start = _M_finish = _M_end_of_storage = 0;
126
127	#else
128
129	destroy(start, finish);
130
131	deallocate();
132
133	start = finish = end_of_storage = 0;
134
135	#endif
136	}
137	};	83	};
138		84
139	struct T_less	85	struct T_less

Lines 2539-2580 Link Here

(-)nx-x11-1.4.0-r3/work/nxcomp/configure (-36 lines)
2539	ac_compiler_gnu=$ac_cv_cxx_compiler_gnu	2539	ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
2540		2540
2541		2541
2542
2543	echo "$as_me:$LINENO: checking whether compiler needs -Wno-deprecated" >&5
2544	echo $ECHO_N "checking whether compiler needs -Wno-deprecated... $ECHO_C" >&6
2545	gcc_version=`${CC} --version \| grep 'gcc (GCC) 3.' \| head -n 1`
2546	case "${gcc_version}" in
2547	gcc*)
2548	echo "$as_me:$LINENO: result: yes" >&5
2549	echo "${ECHO_T}yes" >&6
2550	CXXFLAGS="$CXXFLAGS -Wno-deprecated"
2551	CPPFLAGS="$CPPFLAGS -Wno-deprecated"
2552	;;
2553
2554	*)
2555	echo "$as_me:$LINENO: result: no" >&5
2556	echo "${ECHO_T}no" >&6
2557	;;
2558	esac
2559
2560	echo "$as_me:$LINENO: checking whether compiler accepts -Wmissing-declarations and -Wnested-externs" >&5
2561	echo $ECHO_N "checking whether compiler accepts -Wmissing-declarations and -Wnested-externs... $ECHO_C" >&6
2562	gcc_version=`${CC} --version \| grep 'gcc (GCC) 3.3.' \| head -n 1`
2563	case "${gcc_version}" in
2564	gcc*)
2565	echo "$as_me:$LINENO: result: no" >&5
2566	echo "${ECHO_T}no" >&6
2567	;;
2568
2569	*)
2570	echo "$as_me:$LINENO: result: yes" >&5
2571	echo "${ECHO_T}yes" >&6
2572	CXXFLAGS="$CXXFLAGS -Wmissing-declarations -Wnested-externs"
2573	CPPFLAGS="$CPPFLAGS -Wmissing-declarations -Wnested-externs"
2574	;;
2575	esac
2576
2577
2578	ac_aux_dir=	2542	ac_aux_dir=
2579	for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do	2543	for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
2580	if test -f $ac_dir/install-sh; then	2544	if test -f $ac_dir/install-sh; then

Lines 51-87 Link Here

(-)nx-x11-1.4.0-r3/work/nxcomp/configure.in (-31 lines)
51	AC_PROG_CC	51	AC_PROG_CC
52	AC_LANG_CPLUSPLUS	52	AC_LANG_CPLUSPLUS
53		53
54	dnl Check whether option -Wno-deprecated
55	dnl is needed by GCC compiler.
56
57	AC_MSG_CHECKING([whether compiler needs -Wno-deprecated])
58	gcc_version=`${CC} --version \| grep 'gcc (GCC) 3.' \| head -n 1`
59	case "${gcc_version}" in
60	gcc*)
61	AC_MSG_RESULT([yes])
62	CXXFLAGS="$CXXFLAGS -Wno-deprecated"
63	CPPFLAGS="$CPPFLAGS -Wno-deprecated"
64	;;
65
66	*)
67	AC_MSG_RESULT([no])
68	;;
69	esac
70
71	AC_MSG_CHECKING([whether compiler accepts -Wmissing-declarations and -Wnested-externs])
72	gcc_version=`${CC} --version \| grep 'gcc (GCC) 3.3.' \| head -n 1`
73	case "${gcc_version}" in
74	gcc*)
75	AC_MSG_RESULT([no])
76	;;
77
78	*)
79	AC_MSG_RESULT([yes])
80	CXXFLAGS="$CXXFLAGS -Wmissing-declarations -Wnested-externs"
81	CPPFLAGS="$CPPFLAGS -Wmissing-declarations -Wnested-externs"
82	;;
83	esac
84
85	dnl Check for BSD compatible install.	54	dnl Check for BSD compatible install.
86		55
87	AC_PROG_INSTALL	56	AC_PROG_INSTALL