Checking in fix to bug 198317 for Roland.Mainz@informatik.med.uni-giessen.de r=cls sr=jag
git-svn-id: svn://10.0.0.236/trunk@140035 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
4aa56913ed
commit
8605b8bbb4
@ -101,17 +101,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH), SunOS)
|
||||
ifndef GNU_CC
|
||||
# When using Sun's WorkShop compiler, including
|
||||
# /wherever/workshop-5.0/SC5.0/include/CC/std/time.h
|
||||
# causes most of these compiles to fail with:
|
||||
# line 29: Error: Multiple declaration for std::tm.
|
||||
# So, this gets around the problem.
|
||||
DEFINES += -D_TIME_H=1
|
||||
endif
|
||||
endif
|
||||
|
||||
CXXFLAGS += $(MOZ_GTK_CFLAGS)
|
||||
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
|
||||
@ -438,14 +438,11 @@ main()
|
||||
// [Shouldn't compile] Is it a compile time error to try to |delete| an |nsCOMPtr|?
|
||||
//delete foop;
|
||||
|
||||
/* Solaris Workshop compiler fails to compile this. */
|
||||
#if !defined(XP_UNIX) || !(defined(SOLARIS) && !defined(__GNUG__))
|
||||
cout << endl << "### Test 3: can you |AddRef| if you must?" << endl;
|
||||
STATIC_CAST(IFoo*, foop)->AddRef();
|
||||
|
||||
cout << endl << "### Test 4: can you |Release| if you must?" << endl;
|
||||
STATIC_CAST(IFoo*, foop)->Release();
|
||||
#endif
|
||||
|
||||
cout << endl << "### Test 5: will a |nsCOMPtr| |Release| when it goes out of scope?" << endl;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user