From 09bf7cb705a68f3a763e1d242706df540e9690ef Mon Sep 17 00:00:00 2001 From: Robert Ramey Date: Mon, 16 Nov 2009 05:32:31 +0000 Subject: [PATCH] Revert changes intended for trunk [SVN r57701] --- test/A.cpp | 13 ++----------- test/B.hpp | 4 ++-- test/test_binary.cpp | 4 ++-- test/test_delete_pointer.cpp | 2 +- test/test_derived_class.cpp | 2 +- test/test_inclusion.cpp | 2 +- test/test_iterators.cpp | 2 +- test/test_iterators_base64.cpp | 4 ++-- test/test_new_operator.cpp | 4 ++-- test/test_non_default_ctor.cpp | 14 ++++++-------- test/test_non_default_ctor2.cpp | 9 +++------ test/test_non_intrusive.cpp | 12 ++++++------ test/test_null_ptr.cpp | 6 ++---- test/test_nvp.cpp | 3 +-- test/test_private_ctor.cpp | 2 +- test/test_reset_object_address.cpp | 12 ++++++------ test/test_smart_cast.cpp | 19 +------------------ test/test_tools.hpp | 3 +-- util/test.jam | 6 ++---- vc7ide/Library.vcproj | 5 +---- vc7ide/test_array.vcproj | 4 ++-- vc7ide/test_binary.vcproj | 4 ++-- vc7ide/test_class_info_load.vcproj | 4 ++-- vc7ide/test_codecvt_null.vcproj | 2 +- vc7ide/test_contained_class.vcproj | 2 +- vc7ide/test_delete_pointer.vcproj | 2 +- vc7ide/test_deque.vcproj | 2 +- vc7ide/test_derived_class_ptr.vcproj | 2 +- vc7ide/test_diamond.vcproj | 2 +- vc7ide/test_dll_simple.vcproj | 2 +- vc7ide/test_exported.vcproj | 2 +- vc7ide/test_inclusion.vcproj | 2 +- vc7ide/test_iterators_base64.vcproj | 2 +- vc7ide/test_list.vcproj | 2 +- vc7ide/test_list_ptrs.vcproj | 2 +- vc7ide/test_map.vcproj | 2 +- vc7ide/test_mi.vcproj | 2 +- vc7ide/test_multiple_inheritance.vcproj | 2 +- vc7ide/test_new_operator.vcproj | 2 +- vc7ide/test_no_rtti.vcproj | 2 +- vc7ide/test_non_default_ctor.vcproj | 2 +- vc7ide/test_non_default_ctor2.vcproj | 2 +- vc7ide/test_non_intrusive.vcproj | 2 +- vc7ide/test_null_ptr.vcproj | 2 +- vc7ide/test_nvp.vcproj | 2 +- vc7ide/test_polymorphic.vcproj | 2 +- vc7ide/test_private_ctor.vcproj | 2 +- vc7ide/test_registered.vcproj | 2 +- vc7ide/test_reset_object_addr.vcproj | 2 +- vc7ide/test_set.vcproj | 5 +---- vc7ide/test_shared_ptr.vcproj | 3 +-- vc7ide/test_shared_ptr_132.vcproj | 2 +- vc7ide/test_shared_ptr_multi_base.vcproj | 2 +- vc7ide/test_smart_cast.vcproj | 2 +- vc7ide/test_tracking.vcproj | 2 +- vc7ide/test_unregistered.vcproj | 2 +- vc7ide/test_valarray.vcproj | 2 +- vc7ide/test_variant.vcproj | 2 +- vc7ide/test_vector.vcproj | 2 +- 59 files changed, 86 insertions(+), 130 deletions(-) diff --git a/test/A.cpp b/test/A.cpp index bd3e9fb9..81089193 100644 --- a/test/A.cpp +++ b/test/A.cpp @@ -74,11 +74,6 @@ A::operator std::size_t () const { return retval; } -#if defined(_MSC_VER) -#pragma warning(push) // Save warning settings. -#pragma warning(disable : 4244) // Disable possible loss of data warning - -#endif A::A() : b(true), #ifndef BOOST_NO_INT64_T @@ -95,8 +90,8 @@ A::A() : r(std::rand()), #endif c(0xff & std::rand()), - s(0xff & std::rand()), - t(0xff & std::rand()), + s(std::rand()), + t(std::rand()), u(std::rand()), v(std::rand()), w((float)std::rand()), @@ -108,10 +103,6 @@ A::A() : #endif } -#if defined(_MSC_VER) -#pragma warning(pop) // Restore warnings to previous state. -#endif - bool A::operator==(const A &rhs) const { if(b != rhs.b) diff --git a/test/B.hpp b/test/B.hpp index 9d2f14d8..4180139a 100644 --- a/test/B.hpp +++ b/test/B.hpp @@ -86,8 +86,8 @@ public: }; B::B() : - s(static_cast(std::rand())), - t(static_cast(std::rand())), + s(std::rand()), + t(std::rand()), u(std::rand()), v(std::rand()), w((float)std::rand() / std::rand()), diff --git a/test/test_binary.cpp b/test/test_binary.cpp index a7a4aed0..e5a803a4 100644 --- a/test/test_binary.cpp +++ b/test/test_binary.cpp @@ -8,7 +8,7 @@ // should pass compilation and execution -#include // for rand(), NULL, size_t +#include // for rand(), NULL #include #include @@ -48,7 +48,7 @@ public: A::A(){ int i = sizeof(data); while(i-- > 0) - data[i] = static_cast(0xff & std::rand()); + data[i] = 0xff & std::rand(); } bool A::operator==(const A & rhs) const { diff --git a/test/test_delete_pointer.cpp b/test/test_delete_pointer.cpp index aaff3821..364a97d4 100644 --- a/test/test_delete_pointer.cpp +++ b/test/test_delete_pointer.cpp @@ -87,7 +87,7 @@ test_main( int /* argc */, char* /* argv */[] ) vec.push_back(a); } - const char * testfile = boost::archive::tmpnam(0); + const char * testfile = boost::archive::tmpnam(NULL); BOOST_REQUIRE(NULL != testfile); //output the vector diff --git a/test/test_derived_class.cpp b/test/test_derived_class.cpp index f123c92c..41544a2f 100644 --- a/test/test_derived_class.cpp +++ b/test/test_derived_class.cpp @@ -23,7 +23,7 @@ namespace std{ #include "B.hpp" #include "A.ipp" -int test_main( int /*argc*/, char* /*argv*/[] ) +int test_main( int argc, char* argv[] ) { const char * testfile = boost::archive::tmpnam(NULL); diff --git a/test/test_inclusion.cpp b/test/test_inclusion.cpp index d258cb6a..220a5138 100644 --- a/test/test_inclusion.cpp +++ b/test/test_inclusion.cpp @@ -37,6 +37,6 @@ private: }; int -main(int /*argc*/, char * /*argv*/[]){ +main(int argc, char * argv[]){ return 0; } diff --git a/test/test_iterators.cpp b/test/test_iterators.cpp index cc096dab..bc9a9cae 100644 --- a/test/test_iterators.cpp +++ b/test/test_iterators.cpp @@ -105,7 +105,7 @@ void test_transform_width(unsigned int size){ char * rptr; for(rptr = rawdata + 6; rptr-- > rawdata;) - *rptr = static_cast(0xff & std::rand()); + *rptr = std::rand(); // convert 8 to 6 bit characters typedef boost::archive::iterators::transform_width< diff --git a/test/test_iterators_base64.cpp b/test/test_iterators_base64.cpp index a3ebaa71..88949227 100644 --- a/test/test_iterators_base64.cpp +++ b/test/test_iterators_base64.cpp @@ -42,7 +42,7 @@ void test_base64(){ std::size_t size = sizeof(rawdata) / sizeof(CharType); CharType * rptr; for(rptr = rawdata + size; rptr-- > rawdata;) - *rptr = static_cast(std::rand()); + *rptr = std::rand(); // convert to base64 typedef std::list text_base64_type; @@ -90,7 +90,7 @@ void test_base64(){ } int -test_main( int /*argc*/, char* /*argv*/[] ) +test_main( int argc, char* argv[] ) { test_base64(); #ifndef BOOST_NO_CWCHAR diff --git a/test/test_new_operator.cpp b/test/test_new_operator.cpp index c356b02a..656d66d5 100644 --- a/test/test_new_operator.cpp +++ b/test/test_new_operator.cpp @@ -30,7 +30,7 @@ namespace std{ class ANew : public A { friend class boost::serialization::access; template - void serialize(Archive & ar, const unsigned /*file_version*/){ + void serialize(Archive & ar, const unsigned file_version){ ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(A); } public: @@ -43,7 +43,7 @@ public: ++m_new_calls; return ::operator new(s); } - static void operator delete(void *p, std::size_t /*s*/){ + static void operator delete(void *p, std::size_t s){ ++m_delete_calls; ::operator delete(p); } diff --git a/test/test_non_default_ctor.cpp b/test/test_non_default_ctor.cpp index 4c128a67..e60e055c 100644 --- a/test/test_non_default_ctor.cpp +++ b/test/test_non_default_ctor.cpp @@ -63,8 +63,6 @@ class A ar & BOOST_SERIALIZATION_NVP(w); ar & BOOST_SERIALIZATION_NVP(x); } - A(const A & rhs); - A & operator=(const A & rhs); public: static int count; const int & get_i() const { @@ -78,8 +76,8 @@ int A::count = 0; A::A(int i_) : i(i_), - s(static_cast(0xff & std::rand())), - t(static_cast(0xff & std::rand())), + s(std::rand()), + t(std::rand()), u(std::rand()), v(std::rand()), w((float)std::rand() / std::rand()), @@ -106,13 +104,13 @@ bool A::operator==(const A &rhs) const bool A::operator<(const A &rhs) const { - if(! (s == rhs.s) ) + if(! s == rhs.s ) return s < rhs.s; - if(! (t == rhs.t) ) + if(! t == rhs.t ) return t < rhs.t; - if(! (u == rhs.u) ) + if(! u == rhs.u ) return t < rhs.u; - if(! (v == rhs.v) ) + if(! v == rhs.v ) return t < rhs.v; if(! (std::fabs(w - rhs.w) < std::numeric_limits::round_error() ) ) return t < rhs.w; diff --git a/test/test_non_default_ctor2.cpp b/test/test_non_default_ctor2.cpp index ed718382..6d3dfc3e 100644 --- a/test/test_non_default_ctor2.cpp +++ b/test/test_non_default_ctor2.cpp @@ -99,17 +99,14 @@ template void save_construct_data( ArchiveT& archive, const A* p, - const BOOST_PFTO unsigned int /*version*/ + const BOOST_PFTO unsigned int version ){ archive & boost::serialization::make_nvp("initialValue", p->value); } template -void load_construct_data( - ArchiveT& archive, - A* p, - const unsigned int /*version*/ -){ +void load_construct_data(ArchiveT& archive, A* p, const unsigned int version) +{ IntValueHolder initialValue; archive & boost::serialization::make_nvp("initialValue", initialValue); diff --git a/test/test_non_intrusive.cpp b/test/test_non_intrusive.cpp index 250be63a..eefdf7ec 100644 --- a/test/test_non_intrusive.cpp +++ b/test/test_non_intrusive.cpp @@ -51,8 +51,8 @@ public: }; A::A() : - s(static_cast(0xff & std::rand())), - t(static_cast(0xff & std::rand())), + s(std::rand()), + t(std::rand()), u(std::rand()), v(std::rand()), w((float)std::rand() / std::rand()), @@ -74,13 +74,13 @@ bool A::operator==(const A &rhs) const bool A::operator<(const A &rhs) const { - if(! (s == rhs.s) ) + if(! s == rhs.s ) return s < rhs.s; - if(! (t == rhs.t) ) + if(! t == rhs.t ) return t < rhs.t; - if(! (u == rhs.u) ) + if(! u == rhs.u ) return t < rhs.u; - if(! (v == rhs.v) ) + if(! v == rhs.v ) return t < rhs.v; if(! (std::fabs(w - rhs.w) < std::numeric_limits::round_error() ) ) return t < rhs.w; diff --git a/test/test_null_ptr.cpp b/test/test_null_ptr.cpp index e52631a8..18344dd9 100644 --- a/test/test_null_ptr.cpp +++ b/test/test_null_ptr.cpp @@ -60,10 +60,8 @@ void load(const char *testfile) test_istream is(testfile, TEST_STREAM_FLAGS); test_iarchive ia(is, TEST_ARCHIVE_FLAGS); - polymorphic_derived1 dummy; - - polymorphic_base *rb1 = & dummy; - polymorphic_derived1 *rd1 = & dummy; + polymorphic_base *rb1 = (polymorphic_base *)0xfffffff; + polymorphic_derived1 *rd1 = (polymorphic_derived1 *)0xffffffff; ia >> BOOST_SERIALIZATION_NVP(rb1); BOOST_CHECK_MESSAGE(NULL == rb1, "Null pointer not restored"); diff --git a/test/test_nvp.cpp b/test/test_nvp.cpp index cd546e01..210e2a89 100644 --- a/test/test_nvp.cpp +++ b/test/test_nvp.cpp @@ -26,8 +26,7 @@ namespace std{ #include "B.hpp" #include "A.ipp" -int -test_main( int /* argc */, char* /* argv */[] ) +int test_main( int argc, char* argv[] ) { const char * testfile = boost::archive::tmpnam(NULL); BOOST_REQUIRE(NULL != testfile); diff --git a/test/test_private_ctor.cpp b/test/test_private_ctor.cpp index 72b3904f..8e9a8dfc 100644 --- a/test/test_private_ctor.cpp +++ b/test/test_private_ctor.cpp @@ -24,7 +24,7 @@ class V { {} ~V(){} template - void serialize(Archive& ar, unsigned /*version*/) + void serialize(Archive& ar, unsigned version) { ar & m_i; } diff --git a/test/test_reset_object_address.cpp b/test/test_reset_object_address.cpp index b78d52f8..b1eb60f9 100644 --- a/test/test_reset_object_address.cpp +++ b/test/test_reset_object_address.cpp @@ -63,7 +63,7 @@ class B { friend class boost::serialization::access; int m_i; template - void serialize(Archive &ar, const unsigned int /*file_version*/){ + void serialize(Archive &ar, const unsigned int file_version){ ar & m_i; } public: @@ -108,7 +108,7 @@ void test2(){ class D { friend class boost::serialization::access; template - void serialize(Archive &ar, const unsigned int /*file_version*/){ + void serialize(Archive &ar, const unsigned int file_version){ ar & m_b; } public: @@ -149,7 +149,7 @@ class E { int m_i; friend class boost::serialization::access; template - void serialize(Archive &ar, const unsigned int /*file_version*/){ + void serialize(Archive &ar, const unsigned int file_version){ ar & m_i; } public: @@ -170,7 +170,7 @@ class F { friend class boost::serialization::access; E * m_eptr; template - void serialize(Archive &ar, const unsigned int /*file_version*/){ + void serialize(Archive &ar, const unsigned int file_version){ ar & m_eptr; } public: @@ -219,13 +219,13 @@ class G { A m_a2; A *m_pa2; template - void save(Archive &ar, const unsigned int /*file_version*/) const { + void save(Archive &ar, const unsigned int file_version) const { ar << m_a1; ar << m_a2; ar << m_pa2; } template - void load(Archive &ar, const unsigned int /*file_version*/){ + void load(Archive &ar, const unsigned int file_version){ A a; // temporary A ar >> a; m_a1 = a; diff --git a/test/test_smart_cast.cpp b/test/test_smart_cast.cpp index 12265a01..58f43505 100644 --- a/test/test_smart_cast.cpp +++ b/test/test_smart_cast.cpp @@ -25,20 +25,11 @@ class Base2 int b; }; -#ifdef BOOST_MSVC -# pragma warning(push) -# pragma warning(disable : 4511 4512) -#endif - class Derived : public Base1, public Base2 { long c; }; -#ifdef BOOST_MSVC -#pragma warning(pop) -#endif - BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(Base1) BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(Base2) BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(Derived) @@ -121,6 +112,7 @@ void test_static_pointer_cast(){ ); } + class VBase1 : public boost::noncopyable { char a; @@ -135,11 +127,6 @@ public: virtual ~VBase2(){}; }; -#ifdef BOOST_MSVC -# pragma warning(push) -# pragma warning(disable : 4511 4512) -#endif - class VDerived : public VBase1, public VBase2 { long c; @@ -147,10 +134,6 @@ public: virtual ~VDerived(){}; }; -#ifdef BOOST_MSVC -#pragma warning(pop) -#endif - BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(VBase1) BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(VBase2) BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(VDerived) diff --git a/test/test_tools.hpp b/test/test_tools.hpp index bf2656c9..ccadd182 100644 --- a/test/test_tools.hpp +++ b/test/test_tools.hpp @@ -17,7 +17,6 @@ // See http://www.boost.org for updates, documentation, and revision history. #include // remove, tmpnam -#include // size_t #ifndef BOOST_NO_EXCEPTION_STD_NAMESPACE #include #endif @@ -75,7 +74,7 @@ namespace boost { namespace archive { const char * test_filename(const char * dir = NULL, char *fname = NULL){ static char ibuffer [512]; - std::size_t i; + int i; ibuffer[0] = '\0'; if(NULL == dir){ dir = boost::archive::tmpdir(); diff --git a/util/test.jam b/util/test.jam index 4bde141b..dad55848 100644 --- a/util/test.jam +++ b/util/test.jam @@ -33,10 +33,8 @@ rule run-template ( test-name : sources * : requirements * ) { : # command : # input files : # requirements - # toolset warnings - # gcc:"-Wno-non-virtual-dtor -Wno-ctor-dtor-privacy" - gcc:all # ? - msvc:all # == /W4 + # toolset suppress-warnings + gcc:"-Wno-non-virtual-dtor -Wno-ctor-dtor-privacy" msvc-8.0:"-wd4996" borland:"-w-8080 -w-8071 -w-8057 -w-8062 -w-8008 -w-0018 -w-8066" # toolset optimizations diff --git a/vc7ide/Library.vcproj b/vc7ide/Library.vcproj index ca89b947..c464c15d 100644 --- a/vc7ide/Library.vcproj +++ b/vc7ide/Library.vcproj @@ -36,7 +36,7 @@ ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="0" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="3" CompileAs="0"/> @@ -663,9 +663,6 @@ - - diff --git a/vc7ide/test_array.vcproj b/vc7ide/test_array.vcproj index cd45e666..f66a80e3 100644 --- a/vc7ide/test_array.vcproj +++ b/vc7ide/test_array.vcproj @@ -1704,14 +1704,14 @@ Optimization="0" ImproveFloatingPointConsistency="TRUE" AdditionalIncludeDirectories=""$(ProjectDir)..\..\.."" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=binary_archive.hpp" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1" BasicRuntimeChecks="0" SmallerTypeCheck="FALSE" RuntimeLibrary="3" TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" DebugInformationFormat="1"/> diff --git a/vc7ide/test_binary.vcproj b/vc7ide/test_binary.vcproj index 64fab9e1..2e63fce6 100644 --- a/vc7ide/test_binary.vcproj +++ b/vc7ide/test_binary.vcproj @@ -21,7 +21,7 @@ Optimization="0" ImproveFloatingPointConsistency="TRUE" AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=binary_archive.hpp" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1" SmallerTypeCheck="TRUE" RuntimeLibrary="3" BufferSecurityCheck="TRUE" @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_class_info_load.vcproj b/vc7ide/test_class_info_load.vcproj index d5e2fe97..81c8b6a0 100644 --- a/vc7ide/test_class_info_load.vcproj +++ b/vc7ide/test_class_info_load.vcproj @@ -21,7 +21,7 @@ Optimization="0" ImproveFloatingPointConsistency="TRUE" AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1;BOOST_ARCHIVE_TEST=xml_warchive.hpp" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_LIB_DIAGNOSTIC=1;BOOST_ALL_DYN_LINK=1" SmallerTypeCheck="TRUE" RuntimeLibrary="3" BufferSecurityCheck="TRUE" @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_codecvt_null.vcproj b/vc7ide/test_codecvt_null.vcproj index 9c0d8de1..f96c0aa0 100644 --- a/vc7ide/test_codecvt_null.vcproj +++ b/vc7ide/test_codecvt_null.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_contained_class.vcproj b/vc7ide/test_contained_class.vcproj index 2e35a291..3e425c86 100644 --- a/vc7ide/test_contained_class.vcproj +++ b/vc7ide/test_contained_class.vcproj @@ -28,7 +28,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_delete_pointer.vcproj b/vc7ide/test_delete_pointer.vcproj index 4bf212ce..ff8376c7 100644 --- a/vc7ide/test_delete_pointer.vcproj +++ b/vc7ide/test_delete_pointer.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_deque.vcproj b/vc7ide/test_deque.vcproj index 1cd49922..67469952 100644 --- a/vc7ide/test_deque.vcproj +++ b/vc7ide/test_deque.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_derived_class_ptr.vcproj b/vc7ide/test_derived_class_ptr.vcproj index df09110f..aa585774 100644 --- a/vc7ide/test_derived_class_ptr.vcproj +++ b/vc7ide/test_derived_class_ptr.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_diamond.vcproj b/vc7ide/test_diamond.vcproj index 1aff9ef6..854f1122 100644 --- a/vc7ide/test_diamond.vcproj +++ b/vc7ide/test_diamond.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_dll_simple.vcproj b/vc7ide/test_dll_simple.vcproj index ecae81ba..2e171e9a 100644 --- a/vc7ide/test_dll_simple.vcproj +++ b/vc7ide/test_dll_simple.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_exported.vcproj b/vc7ide/test_exported.vcproj index 3f8e307d..4461b992 100644 --- a/vc7ide/test_exported.vcproj +++ b/vc7ide/test_exported.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_inclusion.vcproj b/vc7ide/test_inclusion.vcproj index 57ec4091..9ff589fe 100644 --- a/vc7ide/test_inclusion.vcproj +++ b/vc7ide/test_inclusion.vcproj @@ -28,7 +28,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_iterators_base64.vcproj b/vc7ide/test_iterators_base64.vcproj index 16dd2ebe..333a9138 100644 --- a/vc7ide/test_iterators_base64.vcproj +++ b/vc7ide/test_iterators_base64.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_list.vcproj b/vc7ide/test_list.vcproj index 9789764c..e307f162 100644 --- a/vc7ide/test_list.vcproj +++ b/vc7ide/test_list.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_list_ptrs.vcproj b/vc7ide/test_list_ptrs.vcproj index 4317d4c1..3eb102f7 100644 --- a/vc7ide/test_list_ptrs.vcproj +++ b/vc7ide/test_list_ptrs.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_map.vcproj b/vc7ide/test_map.vcproj index 02b91506..a90ea74b 100644 --- a/vc7ide/test_map.vcproj +++ b/vc7ide/test_map.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_mi.vcproj b/vc7ide/test_mi.vcproj index 65df43e1..7c9fbe42 100644 --- a/vc7ide/test_mi.vcproj +++ b/vc7ide/test_mi.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_multiple_inheritance.vcproj b/vc7ide/test_multiple_inheritance.vcproj index 216a8819..00f8825e 100644 --- a/vc7ide/test_multiple_inheritance.vcproj +++ b/vc7ide/test_multiple_inheritance.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_new_operator.vcproj b/vc7ide/test_new_operator.vcproj index b178d673..39f4ec31 100644 --- a/vc7ide/test_new_operator.vcproj +++ b/vc7ide/test_new_operator.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_no_rtti.vcproj b/vc7ide/test_no_rtti.vcproj index f7e2954d..9c9196ed 100644 --- a/vc7ide/test_no_rtti.vcproj +++ b/vc7ide/test_no_rtti.vcproj @@ -30,7 +30,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_non_default_ctor.vcproj b/vc7ide/test_non_default_ctor.vcproj index 46c5174f..71761a4e 100644 --- a/vc7ide/test_non_default_ctor.vcproj +++ b/vc7ide/test_non_default_ctor.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_non_default_ctor2.vcproj b/vc7ide/test_non_default_ctor2.vcproj index 4eb791ee..19529186 100644 --- a/vc7ide/test_non_default_ctor2.vcproj +++ b/vc7ide/test_non_default_ctor2.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_non_intrusive.vcproj b/vc7ide/test_non_intrusive.vcproj index 036495a6..346d635a 100644 --- a/vc7ide/test_non_intrusive.vcproj +++ b/vc7ide/test_non_intrusive.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_null_ptr.vcproj b/vc7ide/test_null_ptr.vcproj index 484abc4e..66180bc6 100644 --- a/vc7ide/test_null_ptr.vcproj +++ b/vc7ide/test_null_ptr.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_nvp.vcproj b/vc7ide/test_nvp.vcproj index 2bd4e502..50133955 100644 --- a/vc7ide/test_nvp.vcproj +++ b/vc7ide/test_nvp.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_polymorphic.vcproj b/vc7ide/test_polymorphic.vcproj index 49002cef..bd613537 100644 --- a/vc7ide/test_polymorphic.vcproj +++ b/vc7ide/test_polymorphic.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_private_ctor.vcproj b/vc7ide/test_private_ctor.vcproj index a731a8d9..52a415fa 100644 --- a/vc7ide/test_private_ctor.vcproj +++ b/vc7ide/test_private_ctor.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_registered.vcproj b/vc7ide/test_registered.vcproj index 4709aa48..de1c2e5b 100644 --- a/vc7ide/test_registered.vcproj +++ b/vc7ide/test_registered.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_reset_object_addr.vcproj b/vc7ide/test_reset_object_addr.vcproj index f118c36b..d6a779b9 100644 --- a/vc7ide/test_reset_object_addr.vcproj +++ b/vc7ide/test_reset_object_addr.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_set.vcproj b/vc7ide/test_set.vcproj index 8808a3c9..01cbf7f5 100644 --- a/vc7ide/test_set.vcproj +++ b/vc7ide/test_set.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> @@ -126,9 +126,6 @@ - - diff --git a/vc7ide/test_shared_ptr.vcproj b/vc7ide/test_shared_ptr.vcproj index 8ff33667..1cd674bb 100644 --- a/vc7ide/test_shared_ptr.vcproj +++ b/vc7ide/test_shared_ptr.vcproj @@ -18,7 +18,6 @@ ConfigurationType="1"> diff --git a/vc7ide/test_shared_ptr_132.vcproj b/vc7ide/test_shared_ptr_132.vcproj index 84baec3f..8570650a 100644 --- a/vc7ide/test_shared_ptr_132.vcproj +++ b/vc7ide/test_shared_ptr_132.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_shared_ptr_multi_base.vcproj b/vc7ide/test_shared_ptr_multi_base.vcproj index 787693a2..6c8562af 100644 --- a/vc7ide/test_shared_ptr_multi_base.vcproj +++ b/vc7ide/test_shared_ptr_multi_base.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_smart_cast.vcproj b/vc7ide/test_smart_cast.vcproj index 682afd97..26f3afb1 100644 --- a/vc7ide/test_smart_cast.vcproj +++ b/vc7ide/test_smart_cast.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_tracking.vcproj b/vc7ide/test_tracking.vcproj index abd31769..5ffcac1e 100644 --- a/vc7ide/test_tracking.vcproj +++ b/vc7ide/test_tracking.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_unregistered.vcproj b/vc7ide/test_unregistered.vcproj index 7c74591f..c6b80044 100644 --- a/vc7ide/test_unregistered.vcproj +++ b/vc7ide/test_unregistered.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_valarray.vcproj b/vc7ide/test_valarray.vcproj index 725cfd81..a9413981 100644 --- a/vc7ide/test_valarray.vcproj +++ b/vc7ide/test_valarray.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_variant.vcproj b/vc7ide/test_variant.vcproj index 827f8185..1dd23e04 100644 --- a/vc7ide/test_variant.vcproj +++ b/vc7ide/test_variant.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/> diff --git a/vc7ide/test_vector.vcproj b/vc7ide/test_vector.vcproj index 3e788146..3d91e852 100644 --- a/vc7ide/test_vector.vcproj +++ b/vc7ide/test_vector.vcproj @@ -29,7 +29,7 @@ TreatWChar_tAsBuiltInType="TRUE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" - WarningLevel="4" + WarningLevel="3" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="1" CompileAs="0"/>