Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
379c49fc
Commit
379c49fc
authored
10 years ago
by
Rider Linden
Browse files
Options
Downloads
Patches
Plain Diff
Scratch the unique_ptr for the moment.
parent
e7a1e619
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/llcorehttp/httpcommon.h
+13
-8
13 additions, 8 deletions
indra/llcorehttp/httpcommon.h
with
13 additions
and
8 deletions
indra/llcorehttp/httpcommon.h
+
13
−
8
View file @
379c49fc
...
@@ -188,7 +188,6 @@
...
@@ -188,7 +188,6 @@
///
///
#include
"linden_common.h"
// Modifies curl/curl.h interfaces
#include
"linden_common.h"
// Modifies curl/curl.h interfaces
#include
<string>
#include
<string>
namespace
LLCore
namespace
LLCore
...
@@ -292,24 +291,29 @@ struct HttpStatus
...
@@ -292,24 +291,29 @@ struct HttpStatus
HttpStatus
()
HttpStatus
()
{
{
mDetails
=
std
::
unique_ptr
<
Details
>
(
new
Details
(
LLCORE
,
HE_SUCCESS
)
)
;
mDetails
=
new
Details
(
LLCORE
,
HE_SUCCESS
);
}
}
HttpStatus
(
type_enum_t
type
,
short
status
)
HttpStatus
(
type_enum_t
type
,
short
status
)
{
{
mDetails
=
std
::
unique_ptr
<
Details
>
(
new
Details
(
type
,
status
)
)
;
mDetails
=
new
Details
(
type
,
status
);
}
}
HttpStatus
(
int
http_status
)
HttpStatus
(
int
http_status
)
{
{
mDetails
=
std
::
unique_ptr
<
Details
>
(
new
Details
(
http_status
,
mDetails
=
new
Details
(
http_status
,
(
http_status
>=
200
&&
http_status
<=
299
)
?
HE_SUCCESS
:
HE_REPLY_ERROR
)
)
;
(
http_status
>=
200
&&
http_status
<=
299
)
?
HE_SUCCESS
:
HE_REPLY_ERROR
);
llassert
(
http_status
>=
100
&&
http_status
<=
999
);
llassert
(
http_status
>=
100
&&
http_status
<=
999
);
}
}
HttpStatus
(
const
HttpStatus
&
rhs
)
HttpStatus
(
const
HttpStatus
&
rhs
)
{
{
mDetails
=
std
::
unique_ptr
<
Details
>
(
new
Details
(
*
rhs
.
mDetails
));
mDetails
=
new
Details
(
*
rhs
.
mDetails
);
}
~
HttpStatus
()
{
delete
mDetails
;
}
}
HttpStatus
&
operator
=
(
const
HttpStatus
&
rhs
)
HttpStatus
&
operator
=
(
const
HttpStatus
&
rhs
)
...
@@ -468,7 +472,8 @@ struct HttpStatus
...
@@ -468,7 +472,8 @@ struct HttpStatus
void
*
mErrorData
;
void
*
mErrorData
;
};
};
std
::
unique_ptr
<
Details
>
mDetails
;
//boost::unique_ptr<Details> mDetails;
Details
*
mDetails
;
};
// end struct HttpStatus
};
// end struct HttpStatus
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment